diff options
author | BlueWall | 2011-04-21 19:06:54 -0400 |
---|---|---|
committer | BlueWall | 2011-04-21 19:06:54 -0400 |
commit | b8e282324ecdb608bb0ce47e878728b73cf1af56 (patch) | |
tree | 44f9f8f872731857dfc0a6370819cd5595b927c6 /OpenSim/Region/Framework/Scenes/UuidGatherer.cs | |
parent | some mesh config asthetics (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-b8e282324ecdb608bb0ce47e878728b73cf1af56.zip opensim-SC_OLD-b8e282324ecdb608bb0ce47e878728b73cf1af56.tar.gz opensim-SC_OLD-b8e282324ecdb608bb0ce47e878728b73cf1af56.tar.bz2 opensim-SC_OLD-b8e282324ecdb608bb0ce47e878728b73cf1af56.tar.xz |
fix merge conflicts with OpenSimDefaults.ini
Diffstat (limited to '')
-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 83906d7..77b1535 100644 --- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs +++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs | |||
@@ -298,10 +298,20 @@ namespace OpenSim.Region.Framework.Scenes | |||
298 | if (null != objectAsset) | 298 | if (null != objectAsset) |
299 | { | 299 | { |
300 | string xml = Utils.BytesToString(objectAsset.Data); | 300 | string xml = Utils.BytesToString(objectAsset.Data); |
301 | SceneObjectGroup sog = SceneObjectSerializer.FromOriginalXmlFormat(xml); | 301 | |
302 | 302 | CoalescedSceneObjects coa; | |
303 | if (null != sog) | 303 | if (CoalescedSceneObjectsSerializer.TryFromXml(xml, out coa)) |
304 | GatherAssetUuids(sog, assetUuids); | 304 | { |
305 | foreach (SceneObjectGroup sog in coa.Objects) | ||
306 | GatherAssetUuids(sog, assetUuids); | ||
307 | } | ||
308 | else | ||
309 | { | ||
310 | SceneObjectGroup sog = SceneObjectSerializer.FromOriginalXmlFormat(xml); | ||
311 | |||
312 | if (null != sog) | ||
313 | GatherAssetUuids(sog, assetUuids); | ||
314 | } | ||
305 | } | 315 | } |
306 | } | 316 | } |
307 | 317 | ||