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
..
CoalescedSceneObjectsSerializer.cs	If a component of a coalesced object fails to deserialization, do not add a null where the object should be.	2013-02-08 02:45:30 +00:00
SceneObjectSerializer.cs	Merge branch 'master' into careminster	2013-10-04 20:03:12 +01:00
SceneXmlLoader.cs	Route OAR SOG loading through the common SceneObjectSerializer.FromXml2Format() rather than the functionally identical but buggy Xml2ToSOG().	2012-05-16 00:10:42 +01:00