Merge branch 'master' into careminster

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 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Reflection;
 using System.Text.RegularExpressions;
 using System.Threading;
@@ -314,7 +315,7 @@ namespace OpenSim.Region.Framework.Scenes
 
                 // If it can be parsed as a UUID, it is an asset ID
                 UUID uuid;
-                if (UUID.Parse(id, out uuid))
+                if (UUID.TryParse(id, out uuid))
                     assetUuids[uuid] = 1;
             }
         }