Melanie aecb32b74e Merge branch 'avination' into careminster ...

Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs

2013-01-10 01:25:07 +00:00

..

FetchInventory2

Fix various issues with http inventory

2012-06-02 04:57:10 +01:00

GetMesh

* Fix a null ref error in /..../OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs:339

2012-11-24 22:09:34 -05:00

GetTexture

Merge branch 'master' into careminster

2012-12-07 03:49:04 +00:00

Properties

Added a few more AssemblyInfos. (Plus added the one in OptionalModules, which had been forgotten.)

2012-11-13 19:50:19 -08:00

UploadBakedTexture

* This finishes the implementation of AgentCachedTexture. Requires the XBakes Module and service for full functionality. Previous no-cache functionality works without the service and module. In some ways, I would have been happier not putting an AssetBase in WearableCacheItem.. but turns out it was probably unavoidable. No additional locks, yay.

2012-12-29 08:53:58 -05:00

WebFetchInventoryDescendents

If a link points to a non-existing item in FetchInventory caps, then don't try to add it to the return data rather than suffering an exception later on

2012-06-29 00:11:44 +01:00