From a1d132d3ca29eee50de3d77387e8079642fbafdb Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Thu, 25 Oct 2018 02:36:36 +0100
Subject: let the syntax file include its id again

---
 .../ClientStack/Linden/Caps/SimulatorFeaturesModule.cs    | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region')

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
-- 
cgit v1.1