diff options
author | Melanie | 2011-04-21 23:06:01 +0100 |
---|---|---|
committer | Melanie | 2011-04-21 23:06:01 +0100 |
commit | 0c68fbdb1aa746d1f18242f921bd2605271c06db (patch) | |
tree | c5a35a5723f4c73821c20773d6bc2897b92dcce8 /OpenSim/Region/Framework/Scenes/UuidGatherer.cs | |
parent | Add fix a minor bug (diff) | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC_OLD-0c68fbdb1aa746d1f18242f921bd2605271c06db.zip opensim-SC_OLD-0c68fbdb1aa746d1f18242f921bd2605271c06db.tar.gz opensim-SC_OLD-0c68fbdb1aa746d1f18242f921bd2605271c06db.tar.bz2 opensim-SC_OLD-0c68fbdb1aa746d1f18242f921bd2605271c06db.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/UuidGatherer.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/UuidGatherer.cs | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs index 3978a7d..fdfbc78 100644 --- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs +++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs | |||
@@ -294,10 +294,20 @@ namespace OpenSim.Region.Framework.Scenes | |||
294 | if (null != objectAsset) | 294 | if (null != objectAsset) |
295 | { | 295 | { |
296 | string xml = Utils.BytesToString(objectAsset.Data); | 296 | string xml = Utils.BytesToString(objectAsset.Data); |
297 | SceneObjectGroup sog = SceneObjectSerializer.FromOriginalXmlFormat(xml); | 297 | |
298 | 298 | CoalescedSceneObjects coa; | |
299 | if (null != sog) | 299 | if (CoalescedSceneObjectsSerializer.TryFromXml(xml, out coa)) |
300 | GatherAssetUuids(sog, assetUuids); | 300 | { |
301 | foreach (SceneObjectGroup sog in coa.Objects) | ||
302 | GatherAssetUuids(sog, assetUuids); | ||
303 | } | ||
304 | else | ||
305 | { | ||
306 | SceneObjectGroup sog = SceneObjectSerializer.FromOriginalXmlFormat(xml); | ||
307 | |||
308 | if (null != sog) | ||
309 | GatherAssetUuids(sog, assetUuids); | ||
310 | } | ||
301 | } | 311 | } |
302 | } | 312 | } |
303 | 313 | ||