diff --git a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
index b5dc856778..2ce1672157 100644
--- a/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
+++ b/OpenSim/Region/Framework/Scenes/UuidGatherer.cs
@@ -908,10 +908,11 @@ namespace OpenSim.Region.Framework.Scenes
                 int indx = data.IndexOf((byte)'<');
                 if (indx < 0)
                     return false;
+
                 osUTF8 tmp = data.osUTF8SubString(0, indx);
-                tmp.SelfTrim();
                 data.osUTF8SubStringSelf(indx + 1);
-                return UUID.TryParse(tmp.ToString(), out id);
+
+                return osUTF8.TryParseUUID(tmp, out id);
             }
 
             if (h.StartsWith(uuidB))
@@ -921,9 +922,11 @@ namespace OpenSim.Region.Framework.Scenes
                 int indx = data.IndexOf((byte)'<');
                 if (indx < 0)
                     return false;
+
                 osUTF8 tmp = data.osUTF8SubString(0, indx);
-                tmp.SelfTrim();
-                return UUID.TryParse(tmp.ToString(), out id);
+                data.osUTF8SubStringSelf(indx + 1);
+
+                return osUTF8.TryParseUUID(tmp, out id);
             }
 
             return false;
@@ -1184,8 +1187,7 @@ namespace OpenSim.Region.Framework.Scenes
                             return;
                         if (!osdata.ReadLine(out id)) // uuid
                             return;
-                        id.SelfTrim();
-                        if (UUID.TryParse(id.ToString(), out uid) && uid != UUID.Zero)
+                        if (osUTF8.TryParseUUID(id, out uid) && uid != UUID.Zero)
                             GatheredUuids[uid] = type == 0 ? (sbyte)AssetType.Animation : (sbyte)AssetType.Sound;
                         if (!osdata.SkipLine()) // flags 
                             return;
@@ -1212,7 +1214,6 @@ namespace OpenSim.Region.Framework.Scenes
             int next;
             while ((next = getxmlNode(ref data, out osUTF8 header)) > 0)
             {
-                
                 if (header.StartsWith((byte)'/'))
                     continue;
                 if (header.StartsWith(uuidB))
@@ -1223,8 +1224,7 @@ namespace OpenSim.Region.Framework.Scenes
                     if(indx < 0)
                         continue;
                     osUTF8 tmp = data.osUTF8SubString(0, indx);
-                    tmp.SelfTrim();
-                    if(UUID.TryParse(tmp.ToString(), out UUID id) && id != UUID.Zero)
+                    if(osUTF8.TryParseUUID(tmp, out UUID id) && id != UUID.Zero)
                         GatheredUuids[id] = (sbyte)AssetType.Texture;
                     data.osUTF8SubStringSelf(indx + 1);
                 }
diff --git a/bin/OpenMetaverse.Rendering.Meshmerizer.dll b/bin/OpenMetaverse.Rendering.Meshmerizer.dll
index 1ec9a18668..353b07585e 100755
Binary files a/bin/OpenMetaverse.Rendering.Meshmerizer.dll and b/bin/OpenMetaverse.Rendering.Meshmerizer.dll differ
diff --git a/bin/OpenMetaverse.StructuredData.dll b/bin/OpenMetaverse.StructuredData.dll
index fdf2da5a28..769e6c105b 100755
Binary files a/bin/OpenMetaverse.StructuredData.dll and b/bin/OpenMetaverse.StructuredData.dll differ
diff --git a/bin/OpenMetaverse.dll b/bin/OpenMetaverse.dll
index ce7560dd2a..e40bfb904d 100755
Binary files a/bin/OpenMetaverse.dll and b/bin/OpenMetaverse.dll differ
diff --git a/bin/OpenMetaverseTypes.dll b/bin/OpenMetaverseTypes.dll
index b450fb355c..813c105795 100755
Binary files a/bin/OpenMetaverseTypes.dll and b/bin/OpenMetaverseTypes.dll differ