From af7c6c5f39dc05dccb891e7bc19ec158de7718a9 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 2 Sep 2011 00:50:16 +0100
Subject: stop passing FromUserInventoryItemID right down into the
 deserializer.

the code becomes simpler if this is set from the outside - only one place needs to do this.
---
 .../CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs  | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region/CoreModules/Framework/InventoryAccess')

diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index f8515b4..e6b58b3 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -732,8 +732,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             XmlElement e = (XmlElement)doc.SelectSingleNode("/CoalescedObject");
             if (e == null || attachment) // Single
             {
-                SceneObjectGroup g =
-                    SceneObjectSerializer.FromOriginalXmlFormat(UUID.Zero, xmlData);
+                SceneObjectGroup g = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
 
                 objlist.Add(g);
                 veclist.Add(new Vector3(0, 0, 0));
@@ -762,8 +761,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
                 XmlNodeList groups = e.SelectNodes("SceneObjectGroup");
                 foreach (XmlNode n in groups)
                 {
-                    SceneObjectGroup g =
-                        SceneObjectSerializer.FromOriginalXmlFormat(UUID.Zero, n.OuterXml);
+                    SceneObjectGroup g = SceneObjectSerializer.FromOriginalXmlFormat(n.OuterXml);
 
                     objlist.Add(g);
                     XmlElement el = (XmlElement)n;
-- 
cgit v1.1