aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar
diff options
context:
space:
mode:
authorMelanie2012-01-12 17:52:29 +0000
committerMelanie2012-01-12 17:52:29 +0000
commit4492bc1bcd055ab5b6f187612462b14b6494fea9 (patch)
tree168e808c3931efc0e05f05ae60aafda6f0a4e946 /OpenSim/Region/CoreModules/Avatar
parentRemove ViewObjectInventory method unsupported by core (diff)
parentAllow update of stored entries within User Management Module-this is needed f... (diff)
downloadopensim-SC_OLD-4492bc1bcd055ab5b6f187612462b14b6494fea9.zip
opensim-SC_OLD-4492bc1bcd055ab5b6f187612462b14b6494fea9.tar.gz
opensim-SC_OLD-4492bc1bcd055ab5b6f187612462b14b6494fea9.tar.bz2
opensim-SC_OLD-4492bc1bcd055ab5b6f187612462b14b6494fea9.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs5
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
index a19bbfd..0833154 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
493 } 493 }
494 else 494 else
495 { 495 {
496 sceneObjects.Add(SceneObjectSerializer.FromOriginalXmlFormat(xmlData)); 496 SceneObjectGroup deserializedObject = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
497
498 if (deserializedObject != null)
499 sceneObjects.Add(deserializedObject);
497 } 500 }
498 501
499 foreach (SceneObjectGroup sog in sceneObjects) 502 foreach (SceneObjectGroup sog in sceneObjects)