diff options
author | Justin Clarke Casey | 2009-05-08 15:47:59 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2009-05-08 15:47:59 +0000 |
commit | 032e3b49eb4f669ffb74a0209aefafcc86f4f6c7 (patch) | |
tree | d275e8445ac33074727e2b0adbc5582b7cbc1aba /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |
parent | * Extracted common superclass for GetAssetStreamHandler and CachedGetAssetStr... (diff) | |
download | opensim-SC_OLD-032e3b49eb4f669ffb74a0209aefafcc86f4f6c7.zip opensim-SC_OLD-032e3b49eb4f669ffb74a0209aefafcc86f4f6c7.tar.gz opensim-SC_OLD-032e3b49eb4f669ffb74a0209aefafcc86f4f6c7.tar.bz2 opensim-SC_OLD-032e3b49eb4f669ffb74a0209aefafcc86f4f6c7.tar.xz |
* refactor: Break out original xml object serialization into a separate class
* No functional change
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 6 |
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; | |||
37 | using OpenSim.Framework.Communications.Cache; | 37 | using OpenSim.Framework.Communications.Cache; |
38 | using OpenSim.Region.Framework; | 38 | using OpenSim.Region.Framework; |
39 | using OpenSim.Region.Framework.Interfaces; | 39 | using OpenSim.Region.Framework.Interfaces; |
40 | using OpenSim.Region.Framework.Scenes.Serialization; | ||
40 | 41 | ||
41 | namespace OpenSim.Region.Framework.Scenes | 42 | namespace 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 | { |