aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-05-08 15:47:59 +0000
committerJustin Clarke Casey2009-05-08 15:47:59 +0000
commit032e3b49eb4f669ffb74a0209aefafcc86f4f6c7 (patch)
treed275e8445ac33074727e2b0adbc5582b7cbc1aba /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
parent* Extracted common superclass for GetAssetStreamHandler and CachedGetAssetStr... (diff)
downloadopensim-SC-032e3b49eb4f669ffb74a0209aefafcc86f4f6c7.zip
opensim-SC-032e3b49eb4f669ffb74a0209aefafcc86f4f6c7.tar.gz
opensim-SC-032e3b49eb4f669ffb74a0209aefafcc86f4f6c7.tar.bz2
opensim-SC-032e3b49eb4f669ffb74a0209aefafcc86f4f6c7.tar.xz
* refactor: Break out original xml object serialization into a separate class
* No functional change
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs6
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index bebf234..f3d5a7c 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -37,6 +37,7 @@ using OpenSim.Framework;
37using OpenSim.Framework.Communications.Cache; 37using OpenSim.Framework.Communications.Cache;
38using OpenSim.Region.Framework; 38using OpenSim.Region.Framework;
39using OpenSim.Region.Framework.Interfaces; 39using OpenSim.Region.Framework.Interfaces;
40using OpenSim.Region.Framework.Scenes.Serialization;
40 41
41namespace OpenSim.Region.Framework.Scenes 42namespace OpenSim.Region.Framework.Scenes
42{ 43{
@@ -2263,7 +2264,8 @@ namespace OpenSim.Region.Framework.Scenes
2263 } 2264 }
2264 2265
2265 string xmlData = Utils.BytesToString(rezAsset.Data); 2266 string xmlData = Utils.BytesToString(rezAsset.Data);
2266 SceneObjectGroup group = new SceneObjectGroup(itemId, xmlData, true); 2267 SceneObjectGroup group
2268 = SceneObjectSerializer.DeserializeOriginalXmlFormat(itemId, xmlData);
2267 2269
2268 if (!Permissions.CanRezObject( 2270 if (!Permissions.CanRezObject(
2269 group.Children.Count, remoteClient.AgentId, pos) 2271 group.Children.Count, remoteClient.AgentId, pos)
@@ -2419,7 +2421,7 @@ namespace OpenSim.Region.Framework.Scenes
2419 if (rezAsset != null) 2421 if (rezAsset != null)
2420 { 2422 {
2421 string xmlData = Utils.BytesToString(rezAsset.Data); 2423 string xmlData = Utils.BytesToString(rezAsset.Data);
2422 SceneObjectGroup group = new SceneObjectGroup(xmlData, true); 2424 SceneObjectGroup group = SceneObjectSerializer.DeserializeOriginalXmlFormat(xmlData);
2423 2425
2424 if (!Permissions.CanRezObject(group.Children.Count, ownerID, pos)) 2426 if (!Permissions.CanRezObject(group.Children.Count, ownerID, pos))
2425 { 2427 {