Melanie 12971e73d4 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs

2013-02-08 23:29:47 +00: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

Rename Bounciness to Restitution

2013-02-07 03:40:48 +00: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