Initial update to OpenSim 0.8.2.1 source code.

4 files changed, 117 insertions, 21 deletions

diff --git a/OpenSim/Region/ScriptEngine/Interfaces/ICompiler.cs b/OpenSim/Region/ScriptEngine/Interfaces/ICompiler.cs
index e4ca635..a7fa502 100644
--- a/OpenSim/Region/ScriptEngine/Interfaces/ICompiler.cs
+++ b/OpenSim/Region/ScriptEngine/Interfaces/ICompiler.cs
@@ -34,7 +34,36 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
 {
     public interface ICompiler
     {
-        void PerformScriptCompile(string source, string asset, UUID ownerID, out string assembly, out Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> linemap);
+        /// <summary>
+        /// Performs the script compile.
+        /// </summary>
+        /// <param name="Script"></param>
+        /// <param name="asset"></param>
+        /// <param name="ownerUUID"></param>
+        /// <param name="alwaysRecompile">
+        /// If set to true then always recompile the script, even if we have a DLL already cached.
+        /// </param>
+        /// <param name="assembly"></param>
+        /// <param name="linemap"></param>
+        void PerformScriptCompile(
+            string source, string asset, UUID ownerID, 
+            out string assembly, out Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> linemap);
+
+        /// <summary>
+        /// Performs the script compile.
+        /// </summary>
+        /// <param name="Script"></param>
+        /// <param name="asset"></param>
+        /// <param name="ownerUUID"></param>
+        /// <param name="alwaysRecompile">
+        /// If set to true then always recompile the script, even if we have a DLL already cached.
+        /// </param>
+        /// <param name="assembly"></param>
+        /// <param name="linemap"></param>
+        void PerformScriptCompile(
+            string source, string asset, UUID ownerID, bool alwaysRecompile,
+            out string assembly, out Dictionary<KeyValuePair<int, int>, KeyValuePair<int, int>> linemap);
+
         string[] GetWarnings();
     }
 }
diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs
index 2027ca6..b9970bf 100644
--- a/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs
+++ b/OpenSim/Region/ScriptEngine/Interfaces/IScriptApi.cs
@@ -26,9 +26,11 @@
  */
 
 using System;
+using System.Threading;
 using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.ScriptEngine.Shared;
 
 namespace OpenSim.Region.ScriptEngine.Interfaces
 {
@@ -38,11 +40,12 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
         /// Initialize the API
         /// </summary>
         /// <remarks>
-        /// Each API has an identifier, which is used to load the
-        /// proper runtime assembly at load time.
-        /// <param name='engine'>/param>
-        /// <param name='part'></param>
-        /// <param name='item'></param>
-        void Initialize(IScriptEngine engine, SceneObjectPart part, TaskInventoryItem item);
+        /// Each API has an identifier, which is used to load the proper runtime assembly at load time.
+        /// <param name='scriptEngine'>/param>
+        /// <param name='host'>/param>
+        /// <param name='item'>/param>
+        /// <param name='coopSleepHandle'>/param>
+        void Initialize(
+            IScriptEngine scriptEngine, SceneObjectPart host, TaskInventoryItem item);
     }
-}
\ No newline at end of file
+}
diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs
index 17c2708..6355669 100644
--- a/OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs
+++ b/OpenSim/Region/ScriptEngine/Interfaces/IScriptEngine.cs
@@ -25,16 +25,17 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-using log4net;
 using System;
-using OpenSim.Region.ScriptEngine.Shared;
+using System.Reflection;
+using OpenSim.Framework;
 using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.Framework.Interfaces;
-using OpenMetaverse;
-using Nini.Config;
 using OpenSim.Region.ScriptEngine.Interfaces;
+using OpenSim.Region.ScriptEngine.Shared;
 using Amib.Threading;
-using OpenSim.Framework;
+using log4net;
+using Nini.Config;
+using OpenMetaverse;
 
 namespace OpenSim.Region.ScriptEngine.Interfaces
 {
@@ -76,6 +77,40 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
         IConfigSource ConfigSource { get; }
         string ScriptEngineName { get; }
         string ScriptEnginePath { get; }
+
+        /// <summary>
+        /// Return the name of the class that will be used for all running scripts.
+        /// </summary>
+        /// <remarks>
+        /// Each class goes in its own assembly so we don't need to otherwise distinguish the class name.
+        /// </remarks>
+        string ScriptClassName { get; }
+
+        /// <summary>
+        /// Return the name of the base class that will be used for all running scripts.
+        /// </summary>
+        string ScriptBaseClassName { get; }
+
+        /// <summary>
+        /// 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 
+        /// FUTURE.
+        /// This can be null if there are no additional assemblies.
+        /// </remarks>
+        string[] ScriptReferencedAssemblies { get; }
+
+        /// <summary>
+        /// Parameters for the generated script's constructor.
+        /// </summary>
+        /// <remarks>
+        /// Can be null if there are no parameters
+        /// </remarks>
+        ParameterInfo[] ScriptBaseClassParameters { get; }
+
         IScriptApi GetApi(UUID itemID, string name);
+
+        void SleepScript(UUID itemID, int delay);
     }
 }
diff --git a/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs b/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
index 2f5b526..e4297c4 100644
--- a/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
+++ b/OpenSim/Region/ScriptEngine/Interfaces/IScriptInstance.cs
@@ -28,9 +28,12 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Threading;
+using System.Diagnostics;
 using OpenMetaverse;
 using log4net;
 using OpenSim.Framework;
+using OpenSim.Region.Framework.Scenes;
 using OpenSim.Region.ScriptEngine.Shared;
 using OpenSim.Region.ScriptEngine.Interfaces;
 
@@ -49,8 +52,13 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
     public interface IScriptWorkItem
     {
         bool Cancel();
-        void Abort();
-        bool Wait(TimeSpan t);
+        bool Abort();
+
+        /// <summary>
+        /// Wait for the work item to complete.
+        /// </summary>
+        /// <param name='t'>The number of milliseconds to wait.  Must be >= -1 (Timeout.Infinite).</param>
+        bool Wait(int t);
     }
 
     /// <summary>
@@ -86,24 +94,35 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
         bool ShuttingDown { get; set; }
 
         /// <summary>
+        /// When stopping the script: should it remain stopped permanently (i.e., save !Running in its state)?
+        /// </summary>
+        bool StayStopped { get; set; }
+
+        /// <summary>
         /// Script state
         /// </summary>
         string State { get; set; }
 
         /// <summary>
+        /// 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; }
+
+        /// <summary>
         /// Time the script was last started
         /// </summary>
         DateTime TimeStarted { get; }
 
         /// <summary>
-        /// Tick the last measurement period was started.
+        /// Collects information about how long the script was executed.
         /// </summary>
-        long MeasurementPeriodTickStart { get; }
+        MetricsCollectorTime ExecutionTime { get; }
 
         /// <summary>
-        /// Ticks spent executing in the last measurement period.
+        /// Scene part in which this script instance is contained.
         /// </summary>
-        long MeasurementPeriodExecutionTime { get; }
+        SceneObjectPart Part { get; }
 
         IScriptEngine Engine { get; }
         UUID AppDomain { get; set; }
@@ -124,6 +143,12 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
 
         uint LocalID { get; }
         UUID AssetID { get; }
+
+        /// <summary>
+        /// Inventory item containing the script used.
+        /// </summary>
+        TaskInventoryItem ScriptTask { get; }
+
         Queue EventQueue { get; }
 
         /// <summary>
@@ -139,6 +164,9 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
         void ClearQueue();
         int StartParam { get; set; }
 
+        WaitHandle CoopWaitHandle { get; }
+        Stopwatch ExecutionTimer { get; }
+
         void RemoveState();
 
         void Init();
@@ -154,8 +182,9 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
         /// <param name="timeout"></param>
         /// How many milliseconds we will wait for an existing script event to finish before
         /// forcibly aborting that event.
+        /// <param name="clearEventQueue">If true then the event queue is also cleared</param>
         /// <returns>true if the script was successfully stopped, false otherwise</returns>
-        bool Stop(int timeout);
+        bool Stop(int timeout, bool clearEventQueue = false);
 
         void SetState(string state);
 
@@ -204,7 +233,7 @@ namespace OpenSim.Region.ScriptEngine.Interfaces
         void SetVars(Dictionary<string, object> vars);
         DetectParams GetDetectParams(int idx);
         UUID GetDetectID(int idx);
-        void SaveState(string assembly);
+        void SaveState();
         void DestroyScriptInstance();
 
         IScriptApi GetApi(string name);