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

6 files changed, 0 insertions, 53 deletions

diff --git a/OpenSim/Region/Framework/Interfaces/IScriptModule.cs b/OpenSim/Region/Framework/Interfaces/IScriptModule.cs
index 42dbedc..143af48 100644
--- a/OpenSim/Region/Framework/Interfaces/IScriptModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IScriptModule.cs
@@ -77,8 +77,6 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <param name="itemID">The item ID of the script.</param>
         bool GetScriptState(UUID itemID);
 
-        void SetRunEnable(UUID instanceID, bool enable);
-
         void SaveAllState();
 
         /// <summary>
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 9ff8467..e413281 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -2143,24 +2143,10 @@ namespace OpenSim.Region.Framework.Scenes
             if (part == null)
                 return;
 
-            IScriptModule[] engines = RequestModuleInterfaces<IScriptModule>();
-
             if (running)
-            {
-                foreach (IScriptModule engine in engines)
-                {
-                    engine.SetRunEnable(itemID, true);
-                }
                 EventManager.TriggerStartScript(part.LocalId, itemID);
-            }
             else
-            {
-                foreach (IScriptModule engine in engines)
-                {
-                    engine.SetRunEnable(itemID, false);
-                }
                 EventManager.TriggerStopScript(part.LocalId, itemID);
-            }
         }
 
         public void GetScriptRunning(IClientAPI controllingClient, UUID objectID, UUID itemID)
diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
index ec13b6c..b04f6b6 100644
--- a/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
@@ -64,16 +64,6 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
         bool Running { get; set; }
 
         /// <summary>
-        /// Gets or sets a value indicating whether this
-        /// <see cref="OpenSim.Region.ScriptEngine.Interfaces.IScriptInstance"/> is run.
-        /// For viewer script editor control
-        /// </summary>
-        /// <value>
-        /// <c>true</c> if run; otherwise, <c>false</c>.
-        /// </value>
-        bool Run { get; set; }
-
-        /// <summary>
         /// Is the script suspended?
         /// </summary>
         bool Suspended { get; set; }
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
index f1abd4b..d570ef7 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
@@ -121,8 +121,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
 
         public bool Running { get; set; }
 
-        public bool Run { get; set; }
-
         public bool Suspended
         {
             get { return m_Suspended; }
@@ -218,7 +216,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
             m_postOnRez = postOnRez;
             m_AttachedAvatar = part.ParentGroup.AttachedAvatar;
             m_RegionID = part.ParentGroup.Scene.RegionInfo.RegionID;
-            Run = true;
 
             if (part != null)
             {
@@ -360,9 +357,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
 
             if (m_startedFromSavedState) 
             {
-                if (!Run)
-                    return;
-
                 Start();
                 if (m_postOnRez) 
                 {
@@ -395,9 +389,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
             }
             else 
             {
-                if (!Run)
-                    return;
-
                 Start();
                 PostEvent(new EventParams("state_entry",
                                           new Object[0], new DetectParams[0]));
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs
index 797bce3..bcdc7bf 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptSerializer.cs
@@ -55,7 +55,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
         public static string Serialize(ScriptInstance instance)
         {
             bool running = instance.Running;
-            bool enabled = instance.Run;
 
             XmlDocument xmldoc = new XmlDocument();
 
@@ -78,12 +77,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
 
             rootElement.AppendChild(run);
 
-            XmlElement run_enable = xmldoc.CreateElement("", "Run", "");
-            run_enable.AppendChild(xmldoc.CreateTextNode(
-                enabled.ToString()));
-
-            rootElement.AppendChild(run_enable);
-
             Dictionary<string, Object> vars = instance.GetVars();
 
             XmlElement variables = xmldoc.CreateElement("", "Variables", "");
@@ -232,7 +225,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
             {
                 object varValue;
                 XmlNodeList partL = rootNode.ChildNodes;
-                instance.Run = true;
 
                 foreach (XmlNode part in partL)
                 {
@@ -244,9 +236,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
                     case "Running":
                         instance.Running=bool.Parse(part.InnerText);
                         break;
-                    case "Run":
-                        instance.Run = bool.Parse(part.InnerText);
-                        break;
                     case "Variables":
                         XmlNodeList varL = part.ChildNodes;
                         foreach (XmlNode var in varL)
diff --git a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
index 20fad05..01aebb6 100644
--- a/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
+++ b/OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
@@ -1541,13 +1541,6 @@ namespace OpenSim.Region.ScriptEngine.XEngine
             }
         }
 
-        public void SetRunEnable(UUID instanceID, bool enable)
-        {
-            IScriptInstance instance = GetInstance(instanceID);
-            if (instance != null)
-                instance.Run = enable;
-        }
-
         public bool GetScriptState(UUID itemID)
         {
             IScriptInstance instance = GetInstance(itemID);