Melanie ce5e900721 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Data/MySQL/Resources/RegionStore.migrations
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs

2012-02-04 11:48:20 +00:00

..

CoalescedSceneObjectsSerializer.cs

Alter uuid gather so that it properly analyzes coalesced objects.

2011-04-21 18:12:29 +01:00

SceneObjectSerializer.cs

Merge branch 'master' into careminster

2012-02-04 11:48:20 +00:00

SceneXmlLoader.cs

Made OARs use the new serialization procedure. (TPs/crossings still on the old one) Added an options argument down the pipeline. For the time being it takes --old-guids as an option to produce <Guid> instead of <UUID>.

2010-10-15 17:27:19 -07:00