aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneXmlLoader.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs6
-rw-r--r--OpenSim/Region/Framework/Scenes/UuidGatherer.cs2
5 files changed, 8 insertions, 8 deletions
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
255 if ((asset != null) && ((AssetType)asset.Type == AssetType.Object)) 255 if ((asset != null) && ((AssetType)asset.Type == AssetType.Object))
256 { 256 {
257 string ass_str = Utils.BytesToString(asset.Data); 257 string ass_str = Utils.BytesToString(asset.Data);
258 SceneObjectGroup sog = SceneObjectSerializer.DeserializeOriginalXmlFormat(ass_str); 258 SceneObjectGroup sog = SceneObjectSerializer.FromOriginalXmlFormat(ass_str);
259 259
260 SniffTextureUUIDs(uuids, sog); 260 SniffTextureUUIDs(uuids, sog);
261 261
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
2265 2265
2266 string xmlData = Utils.BytesToString(rezAsset.Data); 2266 string xmlData = Utils.BytesToString(rezAsset.Data);
2267 SceneObjectGroup group 2267 SceneObjectGroup group
2268 = SceneObjectSerializer.DeserializeOriginalXmlFormat(itemId, xmlData); 2268 = SceneObjectSerializer.FromOriginalXmlFormat(itemId, xmlData);
2269 2269
2270 if (!Permissions.CanRezObject( 2270 if (!Permissions.CanRezObject(
2271 group.Children.Count, remoteClient.AgentId, pos) 2271 group.Children.Count, remoteClient.AgentId, pos)
@@ -2421,7 +2421,7 @@ namespace OpenSim.Region.Framework.Scenes
2421 if (rezAsset != null) 2421 if (rezAsset != null)
2422 { 2422 {
2423 string xmlData = Utils.BytesToString(rezAsset.Data); 2423 string xmlData = Utils.BytesToString(rezAsset.Data);
2424 SceneObjectGroup group = SceneObjectSerializer.DeserializeOriginalXmlFormat(xmlData); 2424 SceneObjectGroup group = SceneObjectSerializer.FromOriginalXmlFormat(xmlData);
2425 2425
2426 if (!Permissions.CanRezObject(group.Children.Count, ownerID, pos)) 2426 if (!Permissions.CanRezObject(group.Children.Count, ownerID, pos))
2427 { 2427 {
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
59 rootNode = doc.FirstChild; 59 rootNode = doc.FirstChild;
60 foreach (XmlNode aPrimNode in rootNode.ChildNodes) 60 foreach (XmlNode aPrimNode in rootNode.ChildNodes)
61 { 61 {
62 SceneObjectGroup obj = SceneObjectSerializer.DeserializeOriginalXmlFormat(aPrimNode.OuterXml); 62 SceneObjectGroup obj = SceneObjectSerializer.FromOriginalXmlFormat(aPrimNode.OuterXml);
63 63
64 if (newIDS) 64 if (newIDS)
65 { 65 {
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
49 /// </summary> 49 /// </summary>
50 /// <param name="serialization"></param> 50 /// <param name="serialization"></param>
51 /// <returns></returns> 51 /// <returns></returns>
52 public static SceneObjectGroup DeserializeOriginalXmlFormat(string serialization) 52 public static SceneObjectGroup FromOriginalXmlFormat(string serialization)
53 { 53 {
54 return DeserializeOriginalXmlFormat(UUID.Zero, serialization); 54 return FromOriginalXmlFormat(UUID.Zero, serialization);
55 } 55 }
56 56
57 /// <summary> 57 /// <summary>
@@ -59,7 +59,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
59 /// </summary> 59 /// </summary>
60 /// <param name="serialization"></param> 60 /// <param name="serialization"></param>
61 /// <returns></returns> 61 /// <returns></returns>
62 public static SceneObjectGroup DeserializeOriginalXmlFormat(UUID fromUserInventoryItemID, string serialization) 62 public static SceneObjectGroup FromOriginalXmlFormat(UUID fromUserInventoryItemID, string serialization)
63 { 63 {
64 //m_log.DebugFormat("[SOG]: Starting deserialization of SOG"); 64 //m_log.DebugFormat("[SOG]: Starting deserialization of SOG");
65 //int time = System.Environment.TickCount; 65 //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
264 if (null != objectAsset) 264 if (null != objectAsset)
265 { 265 {
266 string xml = Utils.BytesToString(objectAsset.Data); 266 string xml = Utils.BytesToString(objectAsset.Data);
267 SceneObjectGroup sog = SceneObjectSerializer.DeserializeOriginalXmlFormat(xml); 267 SceneObjectGroup sog = SceneObjectSerializer.FromOriginalXmlFormat(xml);
268 GatherAssetUuids(sog, assetUuids); 268 GatherAssetUuids(sog, assetUuids);
269 } 269 }
270 } 270 }