Melanie 89c9528e38 Merge branch 'avination' into careminster ...

Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs

2012-07-11 14:27:33 +01:00

..

CoalescedSceneObjectsSerializer.cs

Fix bug where an avatar that had an object they owned attached through llAttachToAvatar() or osForceAttachToAvatar() would wrongly have next permissions come into play when they detached that object and rezzed it in scene.

2012-05-23 01:58:10 +01:00

SceneObjectSerializer.cs

Merge branch 'avination' into careminster

2012-07-11 14:27:33 +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