aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-05-08 16:44:00 +0000
committerJustin Clarke Casey2009-05-08 16:44:00 +0000
commitfcfc97a4bf884aaf56bad571fe041ee87ec729c4 (patch)
treed5f29ed7acb08910286bfd8fdafe93398a8866a5 /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
parent* refactor: Break out original xml object serialization into a separate class (diff)
downloadopensim-SC-fcfc97a4bf884aaf56bad571fe041ee87ec729c4.zip
opensim-SC-fcfc97a4bf884aaf56bad571fe041ee87ec729c4.tar.gz
opensim-SC-fcfc97a4bf884aaf56bad571fe041ee87ec729c4.tar.bz2
opensim-SC-fcfc97a4bf884aaf56bad571fe041ee87ec729c4.tar.xz
* minor: rename xml sog serialization method for readability
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs4
1 files changed, 2 insertions, 2 deletions
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 {