Melanie bda4565067 Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs		2013-05-08 20:59:44 +01:00
..
AvatarPickerSearch	Added AvatarPickerSearch capability handler.	2013-05-07 18:01:48 -07: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 'avination' into careminster	2013-01-23 19:31:27 +00: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	Move SoubleQueu to Util. Change HTTP inv to prioritize COF. Determine COF for SP	2013-02-06 04:03:32 +01:00