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/Hypergrid/HGAssetMapper.cs | |
parent | * Extracted common superclass for GetAssetStreamHandler and CachedGetAssetStr... (diff) | |
download | opensim-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 'OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs b/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs index 1186bee..3399504 100644 --- a/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs +++ b/OpenSim/Region/Framework/Scenes/Hypergrid/HGAssetMapper.cs | |||
@@ -34,6 +34,7 @@ using OpenMetaverse; | |||
34 | using OpenSim.Framework; | 34 | using OpenSim.Framework; |
35 | using OpenSim.Framework.Communications.Cache; | 35 | using OpenSim.Framework.Communications.Cache; |
36 | using OpenSim.Framework.Communications.Clients; | 36 | using OpenSim.Framework.Communications.Clients; |
37 | using OpenSim.Region.Framework.Scenes.Serialization; | ||
37 | 38 | ||
38 | //using HyperGrid.Framework; | 39 | //using HyperGrid.Framework; |
39 | //using OpenSim.Region.Communications.Hypergrid; | 40 | //using OpenSim.Region.Communications.Hypergrid; |
@@ -254,13 +255,12 @@ namespace OpenSim.Region.Framework.Scenes.Hypergrid | |||
254 | if ((asset != null) && ((AssetType)asset.Type == AssetType.Object)) | 255 | if ((asset != null) && ((AssetType)asset.Type == AssetType.Object)) |
255 | { | 256 | { |
256 | string ass_str = Utils.BytesToString(asset.Data); | 257 | string ass_str = Utils.BytesToString(asset.Data); |
257 | SceneObjectGroup sog = new SceneObjectGroup(ass_str, true); | 258 | SceneObjectGroup sog = SceneObjectSerializer.DeserializeOriginalXmlFormat(ass_str); |
258 | 259 | ||
259 | SniffTextureUUIDs(uuids, sog); | 260 | SniffTextureUUIDs(uuids, sog); |
260 | 261 | ||
261 | // We need to sniff further... | 262 | // We need to sniff further... |
262 | SniffTaskInventoryUUIDs(uuids, sog); | 263 | SniffTaskInventoryUUIDs(uuids, sog); |
263 | |||
264 | } | 264 | } |
265 | 265 | ||
266 | return uuids; | 266 | return uuids; |