Merge branch 'SledjChisl'

3 files changed, 7 insertions, 7 deletions

diff --git a/OpenSim/Region/ScriptEngine/Interfaces/ICompiler.cs b/OpenSim/Region/ScriptEngine/Interfaces/ICompiler.cs
index a7fa502..b71932e 100644
--- a/OpenSim/Region/ScriptEngine/Interfaces/ICompiler.cs
+++ b/OpenSim/Region/ScriptEngine/Interfaces/ICompiler.cs
@@ -46,7 +46,7 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
         /// <param name="assembly"></param>
         /// <param name="linemap"></param>
         void PerformScriptCompile(
-            string source, string asset, UUID ownerID, 
+            string source, string asset, UUID ownerID,
             out string assembly, out Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> linemap);
 
         /// <summary>
diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs
index 6355669..2e1dbbe 100644
--- a/OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs
+++ b/OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs
@@ -58,7 +58,7 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
         /// Post an event to a single script
         /// </summary>
         bool PostScriptEvent(UUID itemID, EventParams parms);
-        
+
         /// <summary>
         /// Post event to an entire prim
         /// </summary>
@@ -68,7 +68,7 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
         void SetMinEventDelay(UUID itemID, double delay);
         int GetStartParameter(UUID itemID);
 
-        void SetScriptState(UUID itemID, bool state);
+        void SetScriptState(UUID itemID, bool state, bool self);
         bool GetScriptState(UUID itemID);
         void SetState(UUID itemID, string newState);
         void ApiResetScript(UUID itemID);
@@ -95,7 +95,7 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
         /// Assemblies that need to be referenced when compiling scripts.
         /// </summary>
         /// <remarks>
-        /// These are currently additional to those always referenced by the compiler, BUT THIS MAY CHANGE IN THE 
+        /// These are currently additional to those always referenced by the compiler, BUT THIS MAY CHANGE IN THE
         /// FUTURE.
         /// This can be null if there are no additional assemblies.
         /// </remarks>
diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
index e4297c4..40c2fd2 100644
--- a/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
@@ -104,7 +104,7 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
         string State { get; set; }
 
         /// <summary>
-        /// If true then the engine is responsible for persisted state.  If false then some other component may 
+        /// If true then the engine is responsible for persisted state.  If false then some other component may
         /// persist state (e.g. attachments persisting in assets).
         /// </summary>
         bool StatePersistedHere { get; }
@@ -193,7 +193,7 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
         /// </summary>
         /// <param name="data"></param>
         void PostEvent(EventParams data);
-        
+
         void Suspend();
         void Resume();
 
@@ -223,7 +223,7 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
         /// Reset the script.
         /// </summary>
         /// <remarks>
-        /// This must not be called by any thread other than the one executing the scripts current event.  This is 
+        /// This must not be called by any thread other than the one executing the scripts current event.  This is
         /// because there is no wait or abort logic if another thread is in the middle of processing a script event.
         /// Such an external thread should use ResetScript() instead.
         /// </remarks>