Melanie f70357eaa3 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Framework/Monitoring/BaseStatsCollector.cs
	OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
	OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs

2013-06-23 01:59:57 +01:00

..

AvatarPickerSearch

Added AvatarPickerSearch capability handler.

2013-05-07 18:01:48 -07:00

FetchInventory2

Merge branch 'master' into careminster

2013-06-23 01:59:57 +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

2013-06-11 01:03:15 +01:00

Properties

Deleted all AssemblyFileVersion directives

2013-02-19 17:14:55 -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

Fix multi-wear of alpha and tattoo layers.

2013-05-31 22:02:31 +02:00