autogen LSLSyntax version uuid

2 files changed, 47 insertions, 32 deletions

diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index c5c4ab3..e12d37a 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -864,11 +864,24 @@ namespace OpenSim.Framework
         private static byte[] ComputeSHA1Hash(byte[] src)
         {
             byte[] ret;
-            using(SHA1CryptoServiceProvider SHA1 = new SHA1CryptoServiceProvider())
-                 ret = SHA1.ComputeHash(src);
+            using (SHA1CryptoServiceProvider SHA1 = new SHA1CryptoServiceProvider())
+                ret = SHA1.ComputeHash(src);
             return ret;
         }
 
+        public static UUID ComputeSHA1UUID(string src)
+        {
+            return ComputeSHA1UUID(Encoding.Default.GetBytes(src));
+        }
+
+        public static UUID ComputeSHA1UUID(byte[] src)
+        {
+            byte[] ret;
+            using (SHA1CryptoServiceProvider SHA1 = new SHA1CryptoServiceProvider())
+                ret = SHA1.ComputeHash(src);
+            return new UUID(ret, 2);
+        }
+
         public static int fast_distance2d(int x, int y)
         {
             x = Math.Abs(x);
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
index a6a4b1c..1c4b538 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
@@ -77,16 +77,17 @@ namespace OpenSim.Region.ClientStack.Linden
         private string m_GridName = string.Empty;
         private string m_GridURL = string.Empty;
 
+        private bool m_doScriptSyntax;
+        static private object m_scriptSyntaxLock = new object();
         static private UUID m_scriptSyntaxID = UUID.Zero;
         static private string m_scriptSyntaxXML;
-        private bool m_doScriptSyntax;
 
         #region ISharedRegionModule Members
 
         public void Initialise(IConfigSource source)
         {
             IConfig config = source.Configs["SimulatorFeatures"];
-            m_doScriptSyntax = false;
+            m_doScriptSyntax = true;
             if (config != null)
             {
                 //
@@ -330,40 +331,41 @@ namespace OpenSim.Region.ClientStack.Linden
 
         private void ReadScriptSyntax()
         {
-            if(!m_doScriptSyntax || m_scriptSyntaxID != UUID.Zero)
-                return;
+            lock(m_scriptSyntaxLock)
+            {
+                if(!m_doScriptSyntax || m_scriptSyntaxID != UUID.Zero)
+                    return;
 
-            if(!File.Exists("ScriptSyntax.xml"))
-                return;
+                if(!File.Exists("ScriptSyntax.xml"))
+                    return;
 
-            try
-            {
-                using (StreamReader sr = File.OpenText("ScriptSyntax.xml"))
+                try
                 {
-                    string version = sr.ReadLine();
-                    if(string.IsNullOrEmpty(version))
-                        return;
-                    if(!UUID.TryParse(version, out m_scriptSyntaxID))
-                        return;
-
-                    StringBuilder sb = new StringBuilder(400*1024);
-                    string s="";
-                    char[] trimc = new char[] {' ','\t', '\n', '\r'};
-                    while((s = sr.ReadLine()) != null)
+                    using (StreamReader sr = File.OpenText("ScriptSyntax.xml"))
                     {
-                        s = s.Trim(trimc);
-                        if(String.IsNullOrEmpty(s) || s.StartsWith("<--"))
-                            continue;
-                        sb.Append(s);
+                        StringBuilder sb = new StringBuilder(400*1024);
+                        sb.Append("<llsd><map><key>llsd-lsl-syntax-version</key><integer>2</integer>");
+
+                        string s="";
+                        char[] trimc = new char[] {' ','\t', '\n', '\r'};
+                        while((s = sr.ReadLine()) != null)
+                        {
+                            s = s.Trim(trimc);
+                            if(String.IsNullOrEmpty(s) || s.StartsWith("<!--"))
+                                continue;
+                            sb.Append(s);
+                        }
+                        sb.Append("</map></llsd>");
+                        m_scriptSyntaxXML = sb.ToString();
+                        m_scriptSyntaxID = Util.ComputeSHA1UUID(m_scriptSyntaxXML);
                     }
-                    m_scriptSyntaxXML = sb.ToString();
                 }
-            }
-            catch
-            {
-                m_log.Error("[SIMULATOR FEATURES MODULE] fail read ScriptSyntax.xml file");
-                m_scriptSyntaxID = UUID.Zero;
-                m_scriptSyntaxXML = "";
+                catch
+                {
+                    m_log.Error("[SIMULATOR FEATURES MODULE] fail read ScriptSyntax.xml file");
+                    m_scriptSyntaxID = UUID.Zero;
+                    m_scriptSyntaxXML = "";
+                }
             }
         }
     }