From 38db87475528f48752623fcb7e8b40ef728f50e9 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 11 Jan 2012 14:33:26 +0000
Subject: If deserializing a scene object fails during IAR load then ignore the
 object rather than halting the IAR load with an exception.

---
 .../Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs         | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/CoreModules/Avatar')

diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
index 6b24718..ee10d04 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
@@ -493,7 +493,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
                         }
                         else
                         {
-                            sceneObjects.Add(SceneObjectSerializer.FromOriginalXmlFormat(xmlData));
+                            SceneObjectGroup deserializedObject = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
+
+                            if (deserializedObject != null)
+                                sceneObjects.Add(deserializedObject);
                         }
                         
                         foreach (SceneObjectGroup sog in sceneObjects)
-- 
cgit v1.1