Melanie 3589acdab1 Merge branch 'master' into careminster ... Conflicts: .gitignore OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs prebuild.xml runprebuild.bat		2013-11-23 19:13:22 +00:00
..
AvatarPickerSearch	Add "show caps stats by user" and "show caps stats by cap" console commands to print various counts of capability invocation by user and by cap	2013-07-08 22:03:07 +01: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-11-23 19:13:22 +00:00
Properties	Bump OPenSimulator version and assembly versions up to 0.8.0 Dev	2013-10-04 23:33:47 +01:00
UploadBakedTexture	Merge branch 'master' into careminster	2013-07-18 10:08:10 +01:00
WebFetchInventoryDescendents	Fix multi-wear of alpha and tattoo layers.	2013-05-31 22:02:31 +02:00