diff options
author | Justin Clark-Casey (justincc) | 2009-11-12 18:26:22 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2009-11-12 18:26:22 +0000 |
commit | bb92ba97c6952c60f5bdd50b1c6599894bfef501 (patch) | |
tree | 6d1cce7b98b06549fc91dbdafa94c42f64437c5b /OpenSim/Region/Framework/Scenes/UuidGatherer.cs | |
parent | minor: refactor common setup in uuid gatherer test (diff) | |
download | opensim-SC_OLD-bb92ba97c6952c60f5bdd50b1c6599894bfef501.zip opensim-SC_OLD-bb92ba97c6952c60f5bdd50b1c6599894bfef501.tar.gz opensim-SC_OLD-bb92ba97c6952c60f5bdd50b1c6599894bfef501.tar.bz2 opensim-SC_OLD-bb92ba97c6952c60f5bdd50b1c6599894bfef501.tar.xz |
Stop iar save failing on corrupt assets
Not ideal since one will still have to watch out for big 'corrupt asset' messages in the log, but better than an outright fail
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/UuidGatherer.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/UuidGatherer.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs index 525a93a..930af81 100644 --- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs +++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs | |||
@@ -273,7 +273,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
273 | { | 273 | { |
274 | string xml = Utils.BytesToString(objectAsset.Data); | 274 | string xml = Utils.BytesToString(objectAsset.Data); |
275 | SceneObjectGroup sog = SceneObjectSerializer.FromOriginalXmlFormat(xml); | 275 | SceneObjectGroup sog = SceneObjectSerializer.FromOriginalXmlFormat(xml); |
276 | GatherAssetUuids(sog, assetUuids); | 276 | |
277 | if (null != sog) | ||
278 | GatherAssetUuids(sog, assetUuids); | ||
277 | } | 279 | } |
278 | } | 280 | } |
279 | } | 281 | } |