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.
---
.../Scenes/Serialization/SceneObjectSerializer.cs | 16 +++-------------
1 file changed, 3 insertions(+), 13 deletions(-)
(limited to 'OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs')
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index a60ee9b..e06a222 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -53,19 +53,9 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
///
/// Deserialize a scene object from the original xml format
///
- ///
+ ///
///
- public static SceneObjectGroup FromOriginalXmlFormat(string serialization)
- {
- return FromOriginalXmlFormat(UUID.Zero, serialization);
- }
-
- ///
- /// Deserialize a scene object from the original xml format
- ///
- ///
- ///
- public static SceneObjectGroup FromOriginalXmlFormat(UUID fromUserInventoryItemID, string xmlData)
+ public static SceneObjectGroup FromOriginalXmlFormat(string xmlData)
{
//m_log.DebugFormat("[SOG]: Starting deserialization of SOG");
//int time = System.Environment.TickCount;
@@ -87,7 +77,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
sr = new StringReader(parts[0].InnerXml);
reader = new XmlTextReader(sr);
- SceneObjectGroup sceneObject = new SceneObjectGroup(SceneObjectPart.FromXml(fromUserInventoryItemID, reader));
+ SceneObjectGroup sceneObject = new SceneObjectGroup(SceneObjectPart.FromXml(reader));
reader.Close();
sr.Close();
--
cgit v1.1