Melanie 75c68fa29e Merge branch 'master' into careminster ... Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs		2013-10-04 20:03:12 +01:00
..
InternetRelayClientView	Merge branch 'master' into careminster	2013-10-04 20:03:12 +01:00
TextureSender	Change "help" to display categories/module list then "help <category/module>" to display commands in a category.	2012-03-08 01:51:37 +00:00
UDP/Linden	Stop "show client stats" from throwing an exception if somehow Scene.m_clientManager still retains a reference to a dead client.	2013-09-04 23:48:24 +01:00