aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorDiva Canto2009-12-23 17:10:37 -0800
committerDiva Canto2009-12-23 17:10:37 -0800
commit908992a105280780cbdc8955ee1926e535176875 (patch)
treea8978bb55a170987ffed826124ff12fc04c22216 /OpenSim
parentAdd saving assets from gestures to IAR (diff)
downloadopensim-SC_OLD-908992a105280780cbdc8955ee1926e535176875.zip
opensim-SC_OLD-908992a105280780cbdc8955ee1926e535176875.tar.gz
opensim-SC_OLD-908992a105280780cbdc8955ee1926e535176875.tar.bz2
opensim-SC_OLD-908992a105280780cbdc8955ee1926e535176875.tar.xz
Fixes the broken build of the previous commit.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Framework/Scenes/UuidGatherer.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index 7e3c192..3edb677 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -27,6 +27,7 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.IO;
30using System.Reflection; 31using System.Reflection;
31using System.Text.RegularExpressions; 32using System.Text.RegularExpressions;
32using System.Threading; 33using System.Threading;
@@ -314,7 +315,7 @@ namespace OpenSim.Region.Framework.Scenes
314 315
315 // If it can be parsed as a UUID, it is an asset ID 316 // If it can be parsed as a UUID, it is an asset ID
316 UUID uuid; 317 UUID uuid;
317 if (UUID.Parse(id, out uuid)) 318 if (UUID.TryParse(id, out uuid))
318 assetUuids[uuid] = 1; 319 assetUuids[uuid] = 1;
319 } 320 }
320 } 321 }