From 28b22a4fc18a047d20d968201804082e5d8d9f90 Mon Sep 17 00:00:00 2001
From: UbitUmarov <ajlduarte@sapo.pt>
Date: Mon, 18 May 2020 04:31:11 +0100
Subject: [PATCH] revert the use of direct data on xml decode, for now

---
 .../Region/Framework/Scenes/UuidGatherer.cs   | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index 65076f4cd1..5e0ea6558c 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -798,6 +798,28 @@ namespace OpenSim.Region.Framework.Scenes
         /// <param name="sceneObjectAsset"></param>
         private void RecordSceneObjectAssetUuids(AssetBase sceneObjectAsset)
         {
+            string xml = Utils.BytesToString(sceneObjectAsset.Data);
+
+            CoalescedSceneObjects coa;
+            if (CoalescedSceneObjectsSerializer.TryFromXml(xml, out coa))
+            {
+                foreach (SceneObjectGroup sog in coa.Objects)
+                {
+                    sog.TemporaryInstance = true;
+                    AddForInspection(sog);
+                }
+            }
+            else
+            {
+                SceneObjectGroup sog = SceneObjectSerializer.FromOriginalXmlFormat(xml);
+                if (null != sog)
+                {
+                    sog.TemporaryInstance = true;
+                    AddForInspection(sog);
+                }
+            }
+
+            /*
             if (CoalescedSceneObjectsSerializer.TryFromXmlData(sceneObjectAsset.Data, out CoalescedSceneObjects coa))
             {
                 foreach (SceneObjectGroup sog in coa.Objects)
@@ -815,6 +837,7 @@ namespace OpenSim.Region.Framework.Scenes
                     AddForInspection(sog);
                 }
             }
+            */
         }
 
         /// <summary>