From fcfc97a4bf884aaf56bad571fe041ee87ec729c4 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Fri, 8 May 2009 16:44:00 +0000
Subject: * minor: rename xml sog serialization method for readability

---
 OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs          | 2 +-
 OpenSim/Region/Framework/Scenes/Scene.Inventory.cs                  | 4 ++--
 OpenSim/Region/Framework/Scenes/SceneXmlLoader.cs                   | 2 +-
 .../Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs  | 6 +++---
 OpenSim/Region/Framework/Scenes/UuidGatherer.cs                     | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs
index 3399504..985ee98 100644
--- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs
+++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs
@@ -255,7 +255,7 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid
             if ((asset != null) && ((AssetType)asset.Type == AssetType.Object))
             {
                 string ass_str = Utils.BytesToString(asset.Data);
-                SceneObjectGroup sog = SceneObjectSerializer.DeserializeOriginalXmlFormat(ass_str);
+                SceneObjectGroup sog = SceneObjectSerializer.FromOriginalXmlFormat(ass_str);
 
                 SniffTextureUUIDs(uuids, sog);
 
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index f3d5a7c..8dbf72a 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -2265,7 +2265,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                             string xmlData = Utils.BytesToString(rezAsset.Data);
                             SceneObjectGroup group 
-                                = SceneObjectSerializer.DeserializeOriginalXmlFormat(itemId, xmlData);
+                                = SceneObjectSerializer.FromOriginalXmlFormat(itemId, xmlData);
 
                             if (!Permissions.CanRezObject(
                                 group.Children.Count, remoteClient.AgentId, pos)
@@ -2421,7 +2421,7 @@ namespace OpenSim.Region.Framework.Scenes
                 if (rezAsset != null)
                 {
                     string xmlData = Utils.BytesToString(rezAsset.Data);
-                    SceneObjectGroup group = SceneObjectSerializer.DeserializeOriginalXmlFormat(xmlData);
+                    SceneObjectGroup group = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
 
                     if (!Permissions.CanRezObject(group.Children.Count, ownerID, pos))
                     {
diff --git a/OpenSim/Region/Framework/Scenes/SceneXmlLoader.cs b/OpenSim/Region/Framework/Scenes/SceneXmlLoader.cs
index 1a4efe7..b5f46ee 100644
--- a/OpenSim/Region/Framework/Scenes/SceneXmlLoader.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneXmlLoader.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Region.Framework.Scenes
                 rootNode = doc.FirstChild;
                 foreach (XmlNode aPrimNode in rootNode.ChildNodes)
                 {
-                    SceneObjectGroup obj = SceneObjectSerializer.DeserializeOriginalXmlFormat(aPrimNode.OuterXml);
+                    SceneObjectGroup obj = SceneObjectSerializer.FromOriginalXmlFormat(aPrimNode.OuterXml);
 
                     if (newIDS)
                     {
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index 54e7270..ebb27c3 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -49,9 +49,9 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
         /// </summary>
         /// <param name="serialization"></param>
         /// <returns></returns>
-        public static SceneObjectGroup DeserializeOriginalXmlFormat(string serialization)
+        public static SceneObjectGroup FromOriginalXmlFormat(string serialization)
         {
-            return DeserializeOriginalXmlFormat(UUID.Zero, serialization);
+            return FromOriginalXmlFormat(UUID.Zero, serialization);
         }
         
         /// <summary>
@@ -59,7 +59,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
         /// </summary>
         /// <param name="serialization"></param>
         /// <returns></returns>
-        public static SceneObjectGroup DeserializeOriginalXmlFormat(UUID fromUserInventoryItemID, string serialization)
+        public static SceneObjectGroup FromOriginalXmlFormat(UUID fromUserInventoryItemID, string serialization)
         {
             //m_log.DebugFormat("[SOG]: Starting deserialization of SOG");
             //int time = System.Environment.TickCount;
diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index a839829..600295f 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -264,7 +264,7 @@ namespace OpenSim.Region.Framework.Scenes
             if (null != objectAsset)
             {
                 string xml = Utils.BytesToString(objectAsset.Data);
-                SceneObjectGroup sog = SceneObjectSerializer.DeserializeOriginalXmlFormat(xml);
+                SceneObjectGroup sog = SceneObjectSerializer.FromOriginalXmlFormat(xml);
                 GatherAssetUuids(sog, assetUuids);
             }
         }       
-- 
cgit v1.1