Imported the scripting changes, so now should be up to date with sugilite.

1 files changed, 20 insertions, 15 deletions

diff --git a/OpenSim/Region/Environment/Scenes/scripting/Script.cs b/OpenSim/Region/Environment/Scenes/scripting/ScriptInfo.cs
index 5d398b0..57df4c4 100644
--- a/OpenSim/Region/Environment/Scenes/scripting/Script.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/ScriptInfo.cs
@@ -28,26 +28,31 @@
 using System;

 using System.Collections.Generic;

 using System.Text;

-using libsecondlife;

 

-namespace OpenSim.Region.Environment.Scripting

+using OpenSim.Region.Environment.Scenes;

+using OpenSim.Framework.Console;

+

+namespace OpenSim.Scripting

 {

-    public class Script

+    /// <summary>

+    /// Class which provides access to the world

+    /// </summary>

+    public class ScriptInfo

     {

-        private LLUUID m_scriptId;        

-        public virtual LLUUID ScriptId

-        {

-            get

-            {

-                return m_scriptId;

-            }

-        }

+        // Reference to world.eventsManager provided for convenience

+        public EventManager events;

+

+        // The main world

+        public Scene world;

+

+        // The console

+        public LogBase logger;

 

-        public Script( LLUUID scriptId )

+        public ScriptInfo(Scene scene)

         {

-            m_scriptId = scriptId;

+            world = scene;

+            events = world.eventManager;

+            logger = OpenSim.Framework.Console.MainLog.Instance;

         }

-        

-        public ScriptEventHandler OnFrame;

     }

 }