[openmetaversefoundation/libopenmetaverse] df4dee: Merge remote-tracking branch 'upstream/master'

1 view
Skip to first unread message

GitHub

unread,
Aug 8, 2014, 3:37:43 PM8/8/14
to libomv-...@googlegroups.com
Branch: refs/heads/master
Home: https://github.com/openmetaversefoundation/libopenmetaverse
Commit: df4dee94cf0c6fe6a46974a719bbb5d50424ab64
https://github.com/openmetaversefoundation/libopenmetaverse/commit/df4dee94cf0c6fe6a46974a719bbb5d50424ab64
Author: Justin Clark-Casey <just...@justincc.org>
Date: 2014-06-19 (Thu, 19 Jun 2014)

Log Message:
-----------
Merge remote-tracking branch 'upstream/master'


Commit: dbb69da3256d4e7c351ce686199e5e48477f7253
https://github.com/openmetaversefoundation/libopenmetaverse/commit/dbb69da3256d4e7c351ce686199e5e48477f7253
Author: Justin Clark-Casey <just...@justincc.org>
Date: 2014-07-24 (Thu, 24 Jul 2014)

Changed paths:
M Programs/Prebuild/Prebuild.exe
M Programs/Prebuild/src/Core/Targets/NAntTarget.cs
M bin/Prebuild.exe

Log Message:
-----------
Stop Prebuild from generating <copy> statements which unnecessarily copy files into bin/Debug or bin/Release

nant_0.91~alpha2+dfsg-3_all.deb in Ubuntu 12.04 and earlier actually ignored these due to a bug
However, nant 0.92~rc1+dfsg-2 in Ubuntu 12.10 fixes this bug (possibly https://github.com/nant/nant/pull/39).
Which makes nant time-consumingly copy these files when the aren't actually used.
Tested removal of <copy> on both nant 0.91 and nant 0.92
This change has been used without issue for OpenSimulator since Nov 14 2012 commit 90c6d2e


Commit: d41da682e85cb38ed90fa46fce7aa56f2207fa4a
https://github.com/openmetaversefoundation/libopenmetaverse/commit/d41da682e85cb38ed90fa46fce7aa56f2207fa4a
Author: Latif Khalifa <lat...@streamgrid.net>
Date: 2014-08-04 (Mon, 04 Aug 2014)

Changed paths:
A OpenMetaverse/ImportExport/Collada.cs

Log Message:
-----------
Added Collada 1.4.1 parser generated from XSD spec with some manual tweaks


Commit: d2fa7434666034d52dcfaf39bdfa79a9a5c7ba50
https://github.com/openmetaversefoundation/libopenmetaverse/commit/d2fa7434666034d52dcfaf39bdfa79a9a5c7ba50
Author: Latif Khalifa <lat...@streamgrid.net>
Date: 2014-08-04 (Mon, 04 Aug 2014)

Changed paths:
M OpenMetaverse/InventoryManager.cs

Log Message:
-----------
Fixed http inv. fetch on opensim


Commit: bf95c23d7b651fa8146ab9e20d9de71180d9ad6d
https://github.com/openmetaversefoundation/libopenmetaverse/commit/bf95c23d7b651fa8146ab9e20d9de71180d9ad6d
Author: Latif Khalifa <lat...@streamgrid.net>
Date: 2014-08-04 (Mon, 04 Aug 2014)

Changed paths:
M OpenMetaverse/Helpers.cs

Log Message:
-----------
Line endings


Commit: bbe7b3962155a6b16df4f8f49ca374e6b0d18f67
https://github.com/openmetaversefoundation/libopenmetaverse/commit/bbe7b3962155a6b16df4f8f49ca374e6b0d18f67
Author: Latif Khalifa <lat...@streamgrid.net>
Date: 2014-08-04 (Mon, 04 Aug 2014)

Changed paths:
M OpenMetaverse/Assets/AssetTypes/AssetMesh.cs
M OpenMetaverse/Helpers.cs

Log Message:
-----------
Added Helpers.ZCompressOSD() and Helpers.ZDecompressOSD()


Commit: cd61255d48ed872a6eb5f0d82a553e5302b9f055
https://github.com/openmetaversefoundation/libopenmetaverse/commit/cd61255d48ed872a6eb5f0d82a553e5302b9f055
Author: Latif Khalifa <lat...@streamgrid.net>
Date: 2014-08-04 (Mon, 04 Aug 2014)

Changed paths:
M OpenMetaverseTypes/Matrix4.cs
M OpenMetaverseTypes/Quaternion.cs

Log Message:
-----------
Added matrix decomposition


Commit: 0481c2b2d9e3e2fba508e3cb3aed9a9f2acf72a9
https://github.com/openmetaversefoundation/libopenmetaverse/commit/0481c2b2d9e3e2fba508e3cb3aed9a9f2acf72a9
Author: Latif Khalifa <lat...@streamgrid.net>
Date: 2014-08-04 (Mon, 04 Aug 2014)

Changed paths:
A OpenMetaverse/ImportExport/ColladalLoader.cs
A OpenMetaverse/ImportExport/Model.cs
A OpenMetaverse/ImportExport/ModelUploader.cs

Log Message:
-----------
Collada parser and model uploader. Work in progress.

Sample code:
var parser = new OpenMetaverse.ImportExport.ColladaLoader();
var prims = parser.Load(o.FileName);
if (prims != null && prims.Count > 0)
{
var uploader = new OpenMetaverse.ImportExport.ModelUploader(client, prims);
uploader.PrepareUpload();
}

Note that PrepareUpload performs the upload as well in this initial stage.

TODO:
* Image upload
* Support for quads in addition to triangles


Commit: fff348d2cd3f5e0e5532ce3dff24aa3a91f00248
https://github.com/openmetaversefoundation/libopenmetaverse/commit/fff348d2cd3f5e0e5532ce3dff24aa3a91f00248
Author: Latif Khalifa <lat...@streamgrid.net>
Date: 2014-08-04 (Mon, 04 Aug 2014)

Changed paths:
M OpenMetaverse/ImportExport/Collada.cs

Log Message:
-----------
Added license stub


Commit: 606834e9cfe1ad7ef031fb1d8e8848e2dec45871
https://github.com/openmetaversefoundation/libopenmetaverse/commit/606834e9cfe1ad7ef031fb1d8e8848e2dec45871
Author: Latif Khalifa <lat...@streamgrid.net>
Date: 2014-08-04 (Mon, 04 Aug 2014)

Changed paths:
M OpenMetaverse/ImportExport/ModelUploader.cs

Log Message:
-----------
Documented ModelUploader, added ability to just do price check


Commit: 7e4bdad41a973ba8e0cf439b545d91e4a3cbfd94
https://github.com/openmetaversefoundation/libopenmetaverse/commit/7e4bdad41a973ba8e0cf439b545d91e4a3cbfd94
Author: Latif Khalifa <lat...@streamgrid.net>
Date: 2014-08-04 (Mon, 04 Aug 2014)

Changed paths:
M OpenMetaverse/Rendering/Rendering.cs
M OpenMetaverseTypes/Vector2.cs
M OpenMetaverseTypes/Vector3.cs

Log Message:
-----------
Better hashcodes for Vectors and Vertices


Commit: f00c274ebd4bc521d85459c226d9a97736ca3d9a
https://github.com/openmetaversefoundation/libopenmetaverse/commit/f00c274ebd4bc521d85459c226d9a97736ca3d9a
Author: Latif Khalifa <lat...@streamgrid.net>
Date: 2014-08-04 (Mon, 04 Aug 2014)

Changed paths:
M OpenMetaverse/ImportExport/Model.cs

Log Message:
-----------
Speedup generation of indices


Commit: 517013caa321010afa04d2577c592c4ca04d1628
https://github.com/openmetaversefoundation/libopenmetaverse/commit/517013caa321010afa04d2577c592c4ca04d1628
Author: Latif Khalifa <lat...@streamgrid.net>
Date: 2014-08-04 (Mon, 04 Aug 2014)

Changed paths:
M OpenMetaverse/ImportExport/ColladalLoader.cs

Log Message:
-----------
Added support for quads in meshes, fixed normals


Commit: 1b4cfd959d0fd5f1e66504e4ae3303cf96cf8c50
https://github.com/openmetaversefoundation/libopenmetaverse/commit/1b4cfd959d0fd5f1e66504e4ae3303cf96cf8c50
Author: Latif Khalifa <lat...@streamgrid.net>
Date: 2014-08-04 (Mon, 04 Aug 2014)

Changed paths:
M OpenMetaverse/ImportExport/ColladalLoader.cs
M OpenMetaverse/ImportExport/Model.cs
M OpenMetaverse/ImportExport/ModelUploader.cs

Log Message:
-----------
Mesh upload: added image upload along with the models


Commit: 941dc830cae7d2bf91eb2caf8ce613f0e2b1eb8d
https://github.com/openmetaversefoundation/libopenmetaverse/commit/941dc830cae7d2bf91eb2caf8ce613f0e2b1eb8d
Author: Latif Khalifa <lat...@streamgrid.net>
Date: 2014-08-04 (Mon, 04 Aug 2014)

Changed paths:
M OpenMetaverse/ImportExport/ColladalLoader.cs
M OpenMetaverse/ImportExport/ModelUploader.cs

Log Message:
-----------
Mesh upload: request inventory fetching of the newly created item


Commit: 2a712ae09c2905e119f39b522e8d10c869c62c1f
https://github.com/openmetaversefoundation/libopenmetaverse/commit/2a712ae09c2905e119f39b522e8d10c869c62c1f
Author: Latif Khalifa <lat...@streamgrid.net>
Date: 2014-08-04 (Mon, 04 Aug 2014)

Changed paths:
M OpenMetaverse/ImportExport/Collada.cs
M OpenMetaverse/ImportExport/ColladalLoader.cs
M OpenMetaverse/ImportExport/ModelUploader.cs

Log Message:
-----------
Mesh upload: moved collada library into it's own namespace


Commit: 9e725bb113c4c7260100f63c19d29f26afcc23ae
https://github.com/openmetaversefoundation/libopenmetaverse/commit/9e725bb113c4c7260100f63c19d29f26afcc23ae
Author: Latif Khalifa <lat...@streamgrid.net>
Date: 2014-08-04 (Mon, 04 Aug 2014)

Changed paths:
M OpenMetaverseTypes/EnumsPrimitive.cs

Log Message:
-----------
LIBOMV-965: wrong enum text, patch by MadpeterZond


Commit: adb43fa1fe59c6942c1180d5e25ec8f913ec7f8d
https://github.com/openmetaversefoundation/libopenmetaverse/commit/adb43fa1fe59c6942c1180d5e25ec8f913ec7f8d
Author: Latif Khalifa <lat...@streamgrid.net>
Date: 2014-08-04 (Mon, 04 Aug 2014)

Changed paths:
M OpenMetaverse/InventoryManager.cs

Log Message:
-----------
LIBOMV-981: Inventory Item name is lost on move using InventoryManager.MoveItem

Patch by: Blake Bourque


Commit: 5f94bda11ffb4ae4555aa5107be17e0ed776c7da
https://github.com/openmetaversefoundation/libopenmetaverse/commit/5f94bda11ffb4ae4555aa5107be17e0ed776c7da
Author: Justin Clark-Casey <just...@justincc.org>
Date: 2014-08-04 (Mon, 04 Aug 2014)

Changed paths:
M OpenMetaverse/Capabilities/CapsBase.cs

Log Message:
-----------
Dispose of HttpWebResponse explicitly in CapsBase.GetResponse()

Current code does not but all IDiposable objects should be disposed.


Commit: 7b094a35dde581e72d74c21cd6d0db2e99344af2
https://github.com/openmetaversefoundation/libopenmetaverse/commit/7b094a35dde581e72d74c21cd6d0db2e99344af2
Author: Justin Clark-Casey <just...@justincc.org>
Date: 2014-08-04 (Mon, 04 Aug 2014)

Changed paths:
M OpenMetaverse/EventDictionary.cs

Log Message:
-----------
Handle incoming caps events sync rather than async to avoid unexpected out-of-order processing

Under moderate or greater CPU load, pushing to the threadpool means that events such as EstablishAgentCommunication may be processed before EnableSimulator
even though the simulator sends them in the reverse order.
This triggers the logging of various errors and warnings by libomv.
Handling these synchronously shouldn't have a huge impact since the number of events is not high and taking time here can only hold up event upload


Commit: 40d2073a95b3c349f657335b1f01f0004201da43
https://github.com/openmetaversefoundation/libopenmetaverse/commit/40d2073a95b3c349f657335b1f01f0004201da43
Author: Justin Clark-Casey <jjus...@googlemail.com>
Date: 2014-08-08 (Fri, 08 Aug 2014)

Changed paths:
M OpenMetaverse/Capabilities/CapsBase.cs
M OpenMetaverse/EventDictionary.cs
M Programs/Prebuild/Prebuild.exe
M Programs/Prebuild/src/Core/Targets/NAntTarget.cs
M bin/Prebuild.exe

Log Message:
-----------
Merge pull request #11 from justincc/master

fix prebuild copying files on nant build


Compare: https://github.com/openmetaversefoundation/libopenmetaverse/compare/ce6b69afddec...40d2073a95b3
Reply all
Reply to author
Forward
0 new messages