Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/Framework/Interfaces/IScriptModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs

1 files changed, 7 insertions, 1 deletions

diff --git a/OpenSim/Region/Framework/Interfaces/IScriptModule.cs b/OpenSim/Region/Framework/Interfaces/IScriptModule.cs
index ce66100..4f8be10 100644
--- a/OpenSim/Region/Framework/Interfaces/IScriptModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IScriptModule.cs
@@ -71,6 +71,12 @@ namespace OpenSim.Region.Framework.Interfaces
 
         bool HasScript(UUID itemID, out bool running);
 
+        /// <summary>
+        /// Returns true if a script is running.
+        /// </summary>
+        /// <param name="itemID">The item ID of the script.</param>
+        bool GetScriptState(UUID itemID);
+
         void SaveAllState();
 
         /// <summary>
@@ -87,4 +93,4 @@ namespace OpenSim.Region.Framework.Interfaces
         /// </returns>
         Dictionary<uint, float> GetObjectScriptsExecutionTimes();
     }
-}
\ No newline at end of file
+}