Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim

4 files changed, 125 insertions, 127 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 3849558..0ea62d7 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -2163,7 +2163,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public LSL_Vector llGetOmega()
         {
             m_host.AddScriptLPS(1);
-            return new LSL_Vector(m_host.RotationalVelocity.X, m_host.RotationalVelocity.Y, m_host.RotationalVelocity.Z);
+            return new LSL_Vector(m_host.AngularVelocity.X, m_host.AngularVelocity.Y, m_host.AngularVelocity.Z);
         }
 
         public LSL_Float llGetTimeOfDay()
@@ -3159,7 +3159,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
         public void llTargetOmega(LSL_Vector axis, double spinrate, double gain)
         {
             m_host.AddScriptLPS(1);
-            m_host.RotationalVelocity = new Vector3((float)(axis.x * spinrate), (float)(axis.y * spinrate), (float)(axis.z * spinrate));
             m_host.AngularVelocity = new Vector3((float)(axis.x * spinrate), (float)(axis.y * spinrate), (float)(axis.z * spinrate));
             m_host.ScheduleTerseUpdate();
             m_host.SendTerseUpdateToAllClients();
@@ -3817,7 +3816,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
             {
             case 1: // DATA_ONLINE (0|1)
                 // TODO: implement fetching of this information
-                if (userProfile.CurrentAgent.AgentOnline)
+                if (userProfile.CurrentAgent!=null && userProfile.CurrentAgent.AgentOnline)
                     reply = "1";
                 else
                     reply = "0";
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
index 917ca44..121159c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/ScriptBase.cs
@@ -113,7 +113,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
                 return;
 
             //ILease lease = (ILease)RemotingServices.GetLifetimeService(data as MarshalByRefObject);
-            RemotingServices.GetLifetimeService(data as MarshalByRefObject);
+            //RemotingServices.GetLifetimeService(data as MarshalByRefObject);
 //            lease.Register(m_sponser);
 
             MethodInfo mi = inits[api];
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
index fe26429..3080c71 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Compiler.cs
@@ -74,7 +74,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
         private string FilePrefix;
         private string ScriptEnginesPath = "ScriptEngines";
         // mapping between LSL and C# line/column numbers
-        private Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> m_positionMap; 
         private ICodeConverter LSL_Converter;
 
         private List<string> m_warnings = new List<string>();
@@ -91,6 +90,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
         private static UInt64 scriptCompileCounter = 0;                                     // And a counter
 
         public IScriptEngine m_scriptEngine;
+        private Dictionary<string, Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>>> m_lineMaps =
+            new Dictionary<string, Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>>>();
+
         public Compiler(IScriptEngine scriptEngine)
         {
             m_scriptEngine = scriptEngine;
@@ -172,8 +174,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
             else
             {
 #if DEBUG
-//                m_log.Debug("[Compiler]: " +
-//                                            "Config OK. Default language \"" + defaultCompileLanguage + "\" specified in \"DefaultCompileLanguage\" is recognized as a valid language.");
+                //                m_log.Debug("[Compiler]: " +
+                //                                            "Config OK. Default language \"" + defaultCompileLanguage + "\" specified in \"DefaultCompileLanguage\" is recognized as a valid language.");
 #endif
                 // LANGUAGE IS IN ALLOW-LIST
                 DefaultCompileLanguage = LanguageMapping[defaultCompileLanguage];
@@ -212,12 +214,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
                 catch (Exception ex)
                 {
                     m_log.Error("[Compiler]: Exception trying to create ScriptEngine directory \"" + Path.Combine(ScriptEnginesPath,
-                                            m_scriptEngine.World.RegionInfo.RegionID.ToString())+ "\": " + ex.ToString());
+                                            m_scriptEngine.World.RegionInfo.RegionID.ToString()) + "\": " + ex.ToString());
                 }
             }
 
             foreach (string file in Directory.GetFiles(Path.Combine(ScriptEnginesPath,
-                     m_scriptEngine.World.RegionInfo.RegionID.ToString()),FilePrefix + "_compiled*"))
+                     m_scriptEngine.World.RegionInfo.RegionID.ToString()), FilePrefix + "_compiled*"))
             {
                 try
                 {
@@ -271,16 +273,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
         /// </summary>
         /// <param name="Script">LSL script</param>
         /// <returns>Filename to .dll assembly</returns>
-        public object PerformScriptCompile(string Script, string asset, UUID ownerUUID)
+        public void PerformScriptCompile(string Script, string asset, UUID ownerUUID,
+            out string assembly, out Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> linemap)
         {
-            m_positionMap = null;
+            linemap = null;
             m_warnings.Clear();
-                
-            string OutFile = Path.Combine(ScriptEnginesPath, Path.Combine(
+
+            assembly = Path.Combine(ScriptEnginesPath, Path.Combine(
                     m_scriptEngine.World.RegionInfo.RegionID.ToString(),
                     FilePrefix + "_compiled_" + asset + ".dll"));
-//            string OutFile = Path.Combine(ScriptEnginesPath,
-//                    FilePrefix + "_compiled_" + asset + ".dll");
 
             if (!Directory.Exists(ScriptEnginesPath))
             {
@@ -305,60 +306,63 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
                 }
             }
 
-            if (Script == String.Empty)
+            // Don't recompile if we already have it
+            // Performing 3 file exists tests for every script can still be slow
+            if (File.Exists(assembly) && File.Exists(assembly + ".text") && File.Exists(assembly + ".map"))
             {
-                if (File.Exists(OutFile))
-                    return OutFile;
-
-                throw new Exception("Cannot find script assembly and no script text present");
+                // If we have already read this linemap file, then it will be in our dictionary. 
+                // Don't build another copy of the dictionary (saves memory) and certainly
+                // don't keep reading the same file from disk multiple times. 
+                if (!m_lineMaps.ContainsKey(assembly))
+                    m_lineMaps[assembly] = ReadMapFile(assembly + ".map");
+                linemap = m_lineMaps[assembly];
+                return;
             }
 
-            // Don't recompile if we already have it
-            //
-            if (File.Exists(OutFile) && File.Exists(OutFile+".text") && File.Exists(OutFile+".map"))
+            if (Script == String.Empty)
             {
-                ReadMapFile(OutFile+".map");
-                return OutFile;
+                throw new Exception("Cannot find script assembly and no script text present");
             }
 
-            enumCompileType l = DefaultCompileLanguage;
+            enumCompileType language = DefaultCompileLanguage;
 
             if (Script.StartsWith("//c#", true, CultureInfo.InvariantCulture))
-                l = enumCompileType.cs;
+                language = enumCompileType.cs;
             if (Script.StartsWith("//vb", true, CultureInfo.InvariantCulture))
             {
-                l = enumCompileType.vb;
+                language = enumCompileType.vb;
                 // We need to remove //vb, it won't compile with that
 
                 Script = Script.Substring(4, Script.Length - 4);
             }
             if (Script.StartsWith("//lsl", true, CultureInfo.InvariantCulture))
-                l = enumCompileType.lsl;
+                language = enumCompileType.lsl;
 
             if (Script.StartsWith("//js", true, CultureInfo.InvariantCulture))
-                l = enumCompileType.js;
+                language = enumCompileType.js;
 
             if (Script.StartsWith("//yp", true, CultureInfo.InvariantCulture))
-                l = enumCompileType.yp;
+                language = enumCompileType.yp;
 
-            if (!AllowedCompilers.ContainsKey(l.ToString()))
+            if (!AllowedCompilers.ContainsKey(language.ToString()))
             {
                 // Not allowed to compile to this language!
                 string errtext = String.Empty;
-                errtext += "The compiler for language \"" + l.ToString() + "\" is not in list of allowed compilers. Script will not be executed!";
+                errtext += "The compiler for language \"" + language.ToString() + "\" is not in list of allowed compilers. Script will not be executed!";
                 throw new Exception(errtext);
             }
 
-            if (m_scriptEngine.World.Permissions.CanCompileScript(ownerUUID, (int)l) == false) {
+            if (m_scriptEngine.World.Permissions.CanCompileScript(ownerUUID, (int)language) == false)
+            {
                 // Not allowed to compile to this language!
                 string errtext = String.Empty;
                 errtext += ownerUUID + " is not in list of allowed users for this scripting language. Script will not be executed!";
                 throw new Exception(errtext);
             }
-            
+
             string compileScript = Script;
 
-            if (l == enumCompileType.lsl)
+            if (language == enumCompileType.lsl)
             {
                 // Its LSL, convert it to C#
                 LSL_Converter = (ICodeConverter)new CSCodeGenerator();
@@ -370,16 +374,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
                     AddWarning(warning);
                 }
 
-                m_positionMap = ((CSCodeGenerator) LSL_Converter).PositionMap;
+                linemap = ((CSCodeGenerator)LSL_Converter).PositionMap;
+                // Write the linemap to a file and save it in our dictionary for next time. 
+                m_lineMaps[assembly] = linemap;
+                WriteMapFile(assembly + ".map", linemap);
             }
 
-            if (l == enumCompileType.yp)
+            if (language == enumCompileType.yp)
             {
                 // Its YP, convert it to C#
                 compileScript = YP_Converter.Convert(Script);
             }
 
-            switch (l)
+            switch (language)
             {
                 case enumCompileType.cs:
                 case enumCompileType.lsl:
@@ -396,7 +403,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
                     break;
             }
 
-            return CompileFromDotNetText(compileScript, l, asset);
+            assembly = CompileFromDotNetText(compileScript, language, asset, assembly);
+            return;
         }
 
         public string[] GetWarnings()
@@ -468,22 +476,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
         /// </summary>
         /// <param name="Script">CS script</param>
         /// <returns>Filename to .dll assembly</returns>
-        internal string CompileFromDotNetText(string Script, enumCompileType lang, string asset)
+        internal string CompileFromDotNetText(string Script, enumCompileType lang, string asset, string assembly)
         {
             string ext = "." + lang.ToString();
 
             // Output assembly name
             scriptCompileCounter++;
-            string OutFile = Path.Combine(ScriptEnginesPath, Path.Combine(
-                    m_scriptEngine.World.RegionInfo.RegionID.ToString(),
-                    FilePrefix + "_compiled_" + asset + ".dll"));
             try
             {
-                File.Delete(OutFile);
+                File.Delete(assembly);
             }
             catch (Exception e) // NOTLEGIT - Should be just FileIOException
             {
-                throw new Exception("Unable to delete old existing "+
+                throw new Exception("Unable to delete old existing " +
                         "script-file before writing new. Compile aborted: " +
                         e.ToString());
             }
@@ -492,7 +497,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
             if (WriteScriptSourceToDebugFile)
             {
                 string srcFileName = FilePrefix + "_source_" +
-                        Path.GetFileNameWithoutExtension(OutFile) + ext;
+                        Path.GetFileNameWithoutExtension(assembly) + ext;
                 try
                 {
                     File.WriteAllText(Path.Combine(Path.Combine(
@@ -502,7 +507,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
                 }
                 catch (Exception ex) //NOTLEGIT - Should be just FileIOException
                 {
-                    m_log.Error("[Compiler]: Exception while "+
+                    m_log.Error("[Compiler]: Exception while " +
                                 "trying to write script source to file \"" +
                                 srcFileName + "\": " + ex.ToString());
                 }
@@ -528,7 +533,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
             }
 
             parameters.GenerateExecutable = false;
-            parameters.OutputAssembly = OutFile;
+            parameters.OutputAssembly = assembly;
             parameters.IncludeDebugInformation = CompileWithDebugInformation;
             //parameters.WarningLevel = 1; // Should be 4?
             parameters.TreatWarningsAsErrors = false;
@@ -543,7 +548,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
                 case enumCompileType.cs:
                 case enumCompileType.lsl:
                     bool complete = false;
-                    bool retried  = false;
+                    bool retried = false;
                     do
                     {
                         lock (CScodeProvider)
@@ -584,7 +589,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
                         parameters, Script);
                     break;
                 default:
-                    throw new Exception("Compiler is not able to recongnize "+
+                    throw new Exception("Compiler is not able to recongnize " +
                                         "language type \"" + lang.ToString() + "\"");
             }
 
@@ -609,7 +614,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
 
                     if (severity == "Error")
                     {
-                        lslPos = FindErrorPosition(CompErr.Line, CompErr.Column);
+                        lslPos = FindErrorPosition(CompErr.Line, CompErr.Column, m_lineMaps[assembly]);
                         string text = CompErr.ErrorText;
 
                         // Use LSL type names
@@ -635,14 +640,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
             //  the compile may not be immediately apparent. Wait a 
             //  reasonable amount of time before giving up on it.
 
-            if (!File.Exists(OutFile))
+            if (!File.Exists(assembly))
             {
-                for (int i=0; i<20 && !File.Exists(OutFile); i++)
+                for (int i = 0; i < 20 && !File.Exists(assembly); i++)
                 {
                     System.Threading.Thread.Sleep(250);
                 }
                 // One final chance...
-                if (!File.Exists(OutFile))
+                if (!File.Exists(assembly))
                 {
                     errtext = String.Empty;
                     errtext += "No compile error. But not able to locate compiled file.";
@@ -650,15 +655,15 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
                 }
             }
 
-//            m_log.DebugFormat("[Compiler] Compiled new assembly "+
-//                    "for {0}", asset);
+            //            m_log.DebugFormat("[Compiler] Compiled new assembly "+
+            //                    "for {0}", asset);
 
             // Because windows likes to perform exclusive locks, we simply
             // write out a textual representation of the file here
             //
             // Read the binary file into a buffer
             //
-            FileInfo fi = new FileInfo(OutFile);
+            FileInfo fi = new FileInfo(assembly);
 
             if (fi == null)
             {
@@ -671,7 +676,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
 
             try
             {
-                FileStream fs = File.Open(OutFile, FileMode.Open, FileAccess.Read);
+                FileStream fs = File.Open(assembly, FileMode.Open, FileAccess.Read);
                 fs.Read(data, 0, data.Length);
                 fs.Close();
             }
@@ -690,40 +695,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
 
             Byte[] buf = enc.GetBytes(filetext);
 
-            FileStream sfs = File.Create(OutFile+".text");
+            FileStream sfs = File.Create(assembly + ".text");
             sfs.Write(buf, 0, buf.Length);
             sfs.Close();
 
-            string posmap = String.Empty;
-            if (m_positionMap != null)
-            {
-                foreach (KeyValuePair<KeyValuePair<int, int>, KeyValuePair<int, int>> kvp in m_positionMap)
-                {
-                    KeyValuePair<int, int> k = kvp.Key;
-                    KeyValuePair<int, int> v = kvp.Value;
-                    posmap += String.Format("{0},{1},{2},{3}\n",
-                            k.Key, k.Value, v.Key, v.Value);
-                }
-            }
-
-            buf = enc.GetBytes(posmap);
-
-            FileStream mfs = File.Create(OutFile+".map");
-            mfs.Write(buf, 0, buf.Length);
-            mfs.Close();
-
-            return OutFile;
-        }
-
-        public KeyValuePair<int, int> FindErrorPosition(int line, int col)
-        {
-            return FindErrorPosition(line, col, m_positionMap);
+            return assembly;
         }
 
-        private class kvpSorter : IComparer<KeyValuePair<int,int>>
+        private class kvpSorter : IComparer<KeyValuePair<int, int>>
         {
-            public int Compare(KeyValuePair<int,int> a,
-                    KeyValuePair<int,int> b)
+            public int Compare(KeyValuePair<int, int> a,
+                    KeyValuePair<int, int> b)
             {
                 return a.Key.CompareTo(b.Key);
             }
@@ -742,8 +724,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
                     out ret))
                 return ret;
 
-            List<KeyValuePair<int,int>> sorted =
-                    new List<KeyValuePair<int,int>>(positionMap.Keys);
+            List<KeyValuePair<int, int>> sorted =
+                    new List<KeyValuePair<int, int>>(positionMap.Keys);
 
             sorted.Sort(new kvpSorter());
 
@@ -791,32 +773,37 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
             return message;
         }
 
-        public Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> LineMap()
+
+        private static void WriteMapFile(string filename, Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> linemap)
         {
-            if (m_positionMap == null)
-                return null;
-            
-            Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> ret =
-                new Dictionary<KeyValuePair<int,int>, KeyValuePair<int, int>>();
-            
-            foreach (KeyValuePair<int, int> kvp in m_positionMap.Keys)
-                ret.Add(kvp, m_positionMap[kvp]);
-            
-            return ret;
+            string mapstring = String.Empty;
+            foreach (KeyValuePair<KeyValuePair<int, int>, KeyValuePair<int, int>> kvp in linemap)
+            {
+                KeyValuePair<int, int> k = kvp.Key;
+                KeyValuePair<int, int> v = kvp.Value;
+                mapstring += String.Format("{0},{1},{2},{3}\n", k.Key, k.Value, v.Key, v.Value);
+            }
+
+            System.Text.ASCIIEncoding enc = new System.Text.ASCIIEncoding();
+            Byte[] mapbytes = enc.GetBytes(mapstring);
+            FileStream mfs = File.Create(filename);
+            mfs.Write(mapbytes, 0, mapbytes.Length);
+            mfs.Close();
         }
 
-        private void ReadMapFile(string filename)
+
+        private static Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> ReadMapFile(string filename)
         {
+            Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> linemap;
             try
             {
                 StreamReader r = File.OpenText(filename);
+                linemap = new Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>>();
 
-                m_positionMap = new Dictionary<KeyValuePair<int,int>, KeyValuePair<int, int>>();
-                
                 string line;
                 while ((line = r.ReadLine()) != null)
                 {
-                    String[] parts = line.Split(new Char[] {','});
+                    String[] parts = line.Split(new Char[] { ',' });
                     int kk = System.Convert.ToInt32(parts[0]);
                     int kv = System.Convert.ToInt32(parts[1]);
                     int vk = System.Convert.ToInt32(parts[2]);
@@ -825,12 +812,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools
                     KeyValuePair<int, int> k = new KeyValuePair<int, int>(kk, kv);
                     KeyValuePair<int, int> v = new KeyValuePair<int, int>(vk, vv);
 
-                    m_positionMap[k] = v;
+                    linemap[k] = v;
                 }
             }
             catch
             {
+                linemap = new Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>>();
             }
+            return linemap;
         }
     }
 }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index 2b858ec..549c038 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -74,27 +74,27 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
         private string m_PrimName;
         private string m_ScriptName;
         private string m_Assembly;
-        private int m_StartParam = 0;
+        private int m_StartParam;
         private string m_CurrentEvent = String.Empty;
-        private bool m_InSelfDelete = false;
+        private bool m_InSelfDelete;
         private int m_MaxScriptQueue;
         private bool m_SaveState = true;
-        private bool m_ShuttingDown = false;
-        private int m_ControlEventsInQueue = 0;
-        private int m_LastControlLevel = 0;
-        private bool m_CollisionInQueue = false;
+        private bool m_ShuttingDown;
+        private int m_ControlEventsInQueue;
+        private int m_LastControlLevel;
+        private bool m_CollisionInQueue;
         private TaskInventoryItem m_thisScriptTask;
         // The following is for setting a minimum delay between events
-        private double m_minEventDelay = 0;
-        private long m_eventDelayTicks = 0;
-        private long m_nextEventTimeTicks = 0;
+        private double m_minEventDelay;
+        private long m_eventDelayTicks;
+        private long m_nextEventTimeTicks;
         private bool m_startOnInit = true;
-        private UUID m_AttachedAvatar = UUID.Zero;
+        private UUID m_AttachedAvatar;
         private StateSource m_stateSource;
         private bool m_postOnRez;
-        private bool m_startedFromSavedState = false;
-        private string m_CurrentState = String.Empty;
-        private UUID m_RegionID = UUID.Zero;
+        private bool m_startedFromSavedState;
+        private UUID m_CurrentStateHash;
+        private UUID m_RegionID;
 
         private Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>>
                 m_LineMap;
@@ -252,16 +252,22 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
             {
                 m_Apis[api] = am.CreateApi(api);
                 m_Apis[api].Initialize(engine, part, m_LocalID, itemID);
-            }
+            }
+
+            try
+            {
+                    if (dom != System.AppDomain.CurrentDomain)
+                            m_Script = (IScript)dom.CreateInstanceAndUnwrap(
+                                            Path.GetFileNameWithoutExtension(assembly),
+                                            "SecondLife.Script");
+                    else
+                            m_Script = (IScript)Assembly.Load(
+                                            Path.GetFileNameWithoutExtension(assembly)).CreateInstance(
+                                            "SecondLife.Script");
 
-            try
-            {
-                m_Script = (IScript)dom.CreateInstanceAndUnwrap(
-                    Path.GetFileNameWithoutExtension(assembly),
-                    "SecondLife.Script");
 
                 //ILease lease = (ILease)RemotingServices.GetLifetimeService(m_Script as ScriptBaseClass);
-                RemotingServices.GetLifetimeService(m_Script as ScriptBaseClass);
+                //RemotingServices.GetLifetimeService(m_Script as ScriptBaseClass);
 //                lease.Register(this);
             }
             catch (Exception)
@@ -893,7 +899,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
 
             string xml = ScriptSerializer.Serialize(this);
 
-            if (m_CurrentState != xml)
+            // Compare hash of the state we just just created with the state last written to disk
+            // If the state is different, update the disk file.
+            UUID hash = UUID.Parse(Utils.MD5String(xml));
+
+            if(hash != m_CurrentStateHash)
             {
                 try
                 {
@@ -911,7 +921,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                 //{
                 //    throw new Exception("Completed persistence save, but no file was created");
                 //}
-                m_CurrentState = xml;
+                m_CurrentStateHash = hash;
             }
         }