From 63c1b7e4754271ec898592ba6209dbc776469370 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 21 Apr 2011 18:12:29 +0100
Subject: Alter uuid gather so that it properly analyzes coalesced objects.

This should correct save all the assets required for the items within the coalesced objects in an IAR.  This should also correctly gather the items on hypergrid takes.
---
 OpenSim/Region/Framework/Scenes/UuidGatherer.cs | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes/UuidGatherer.cs')

diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index 83906d7..77b1535 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -298,10 +298,20 @@ namespace OpenSim.Region.Framework.Scenes
             if (null != objectAsset)
             {
                 string xml = Utils.BytesToString(objectAsset.Data);
-                SceneObjectGroup sog = SceneObjectSerializer.FromOriginalXmlFormat(xml);
-
-                if (null != sog)
-                    GatherAssetUuids(sog, assetUuids);
+                
+                CoalescedSceneObjects coa;
+                if (CoalescedSceneObjectsSerializer.TryFromXml(xml, out coa))
+                {
+                    foreach (SceneObjectGroup sog in coa.Objects)
+                        GatherAssetUuids(sog, assetUuids);
+                }
+                else
+                {
+                    SceneObjectGroup sog = SceneObjectSerializer.FromOriginalXmlFormat(xml);
+    
+                    if (null != sog)
+                        GatherAssetUuids(sog, assetUuids);
+                }
             }
         }
 
-- 
cgit v1.1