Pimped up Default.lsl. Now featuring a touch counter.

Changed "ObjectID" in ScriptEngine to IScriptHost reference. Events will now be queued based on IScriptHost reference instead of string ID of object. Removed "root" object reference in script.

3 files changed, 5 insertions, 1 deletions

diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 8da7923..1cfe9c8 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -18,6 +18,7 @@ namespace OpenSim.Region.Environment.Scenes
     {
         private const uint FULL_MASK_PERMISSIONS = 2147483647;
 
+
         public LLUUID CreatorID;
         public LLUUID OwnerID;
         public LLUUID GroupID;
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs b/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs
index 03587de..62c84a6 100644
--- a/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs
+++ b/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs
@@ -7,6 +7,7 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
 {

     public class NullScriptHost : IScriptHost

     {

+

         LLVector3 m_pos = new LLVector3( 128, 128, 30 );

         public string Name

         {

diff --git a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs
index 510f257..33021ee 100644
--- a/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs
+++ b/OpenSim/Region/Environment/Scenes/Scripting/ScriptEngineInterface.cs
@@ -29,6 +29,8 @@
 using System;

 using System.Collections.Generic;

 using System.Text;

+using OpenSim.Region.Environment.Scenes.Scripting;

+

 //TODO: WHERE TO PLACE THIS?

 namespace OpenSim.Region.Environment.Scenes.Scripting

 {

@@ -36,6 +38,6 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
     {

         void InitializeEngine(OpenSim.Region.Environment.Scenes.Scene Sceneworld, OpenSim.Framework.Console.LogBase logger);

         void Shutdown();

-        void StartScript(string ScriptID, string ObjectID);

+        void StartScript(string ScriptID, IScriptHost ObjectID);

     }

 }