2 files changed, 13 insertions, 3 deletions

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
index e9cda49..b06e93c 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
@@ -347,15 +347,24 @@ namespace OpenSim.Region.ClientStack.Linden
 
                         string s="";
                         char[] trimc = new char[] {' ','\t', '\n', '\r'};
-                        while((s = sr.ReadLine()) != null)
+
+                        s = sr.ReadLine();
+                        if(s == null)
+                            return;
+                        s = s.Trim(trimc);
+                        UUID id;
+                        if(!UUID.TryParse(s,out id))
+                            return;
+
+                        while ((s = sr.ReadLine()) != null)
                         {
                             s = s.Trim(trimc);
-                            if(String.IsNullOrEmpty(s) || s.StartsWith("<!--"))
+                            if (String.IsNullOrEmpty(s) || s.StartsWith("<!--"))
                                 continue;
                             sb.Append(s);
                         }
                         m_scriptSyntaxXML = sb.ToString();
-                        m_scriptSyntaxID = Util.ComputeSHA1UUID(m_scriptSyntaxXML);
+                        m_scriptSyntaxID = id;
                     }
                 }
                 catch
diff --git a/bin/ScriptSyntax.xml b/bin/ScriptSyntax.xml
index 41b669d..78b1a39 100644
--- a/bin/ScriptSyntax.xml
+++ b/bin/ScriptSyntax.xml
@@ -1,3 +1,4 @@
+a6ccf55f-ded5-9093-571c-478cadca66de
 <llsd><map><key>llsd-lsl-syntax-version</key><integer>2</integer>
 <key>controls</key>
 <map>