6 files changed, 41 insertions, 12 deletions

diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/CSharpScriptEngine.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/CSharpScriptEngine.cs
index 870303f..a232b65 100644
--- a/OpenSim/Region/Environment/Scenes/scripting/Engines/CSharpScriptEngine.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/Engines/CSharpScriptEngine.cs
@@ -34,7 +34,7 @@ using System.CodeDom;
 using System.CodeDom.Compiler;

 using Microsoft.CSharp;

 

-namespace OpenSim.Scripting

+namespace OpenSim.Region.Enviorment.Scripting

 {

     public class CSharpScriptEngine : IScriptCompiler

     {

diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JScriptEngine.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JScriptEngine.cs
index ffae1d7..2d44223 100644
--- a/OpenSim/Region/Environment/Scenes/scripting/Engines/JScriptEngine.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/Engines/JScriptEngine.cs
@@ -34,7 +34,7 @@ using System.CodeDom;
 using System.CodeDom.Compiler;

 using Microsoft.JScript;

 

-namespace OpenSim.Scripting

+namespace OpenSim.Region.Enviorment.Scripting

 {

     public class JScriptEngine : IScriptCompiler

     {

diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JSharpScriptEngine.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JSharpScriptEngine.cs
index b33b55d..51b1512 100644
--- a/OpenSim/Region/Environment/Scenes/scripting/Engines/JSharpScriptEngine.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/Engines/JSharpScriptEngine.cs
@@ -34,7 +34,7 @@ using System.CodeDom;
 using System.CodeDom.Compiler;

 using Microsoft.VJSharp;

 

-namespace OpenSim.Scripting

+namespace OpenSim.Region.Enviorment.Scripting

 {

     public class JSharpScriptEngine : IScriptCompiler

     {

diff --git a/OpenSim/Framework/General/Interfaces/Scripting/IScriptAPI.cs b/OpenSim/Region/Environment/Scenes/scripting/Script.cs
index 0c1627b..1e64675 100644
--- a/OpenSim/Framework/General/Interfaces/Scripting/IScriptAPI.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/Script.cs
@@ -28,15 +28,44 @@
 using System;

 using System.Collections.Generic;

 using System.Text;

-using OpenSim.Framework.Types;

 

-using libsecondlife;

-namespace OpenSim.Framework.Interfaces

+using OpenSim.Framework.Console;

+using OpenSim.Framework;

+using OpenSim.Region.Environment;

+using OpenSim.Region.Environment.Scenes;

+

+namespace OpenSim.Region.Enviorment.Scripting

 {

-    public interface IScriptAPI

+    public interface IScript

+    {

+        void Initialise(ScriptInfo scriptInfo);

+        string getName();

+    }

+

+    public class TestScript : IScript

     {

-        LLVector3 GetEntityPosition(uint localID);

-        void SetEntityPosition(uint localID, float x, float y, float z);

-        uint GetRandomAvatarID();

+        ScriptInfo script;

+

+        public string getName()

+        {

+            return "TestScript 0.1";

+        }

+

+        public void Initialise(ScriptInfo scriptInfo)

+        {

+            script = scriptInfo;

+            script.events.OnFrame += new OpenSim.Region.Environment.Scenes.EventManager.OnFrameDelegate(events_OnFrame);

+            script.events.OnNewPresence += new EventManager.OnNewPresenceDelegate(events_OnNewPresence);

+        }

+

+        void events_OnNewPresence(ScenePresence presence)

+        {

+            script.logger.Verbose("Hello " + presence.firstname.ToString() + "!");

+        }

+

+        void events_OnFrame()

+        {

+            //script.logger.Verbose("Hello World!");

+        }

     }

 }

diff --git a/OpenSim/Region/Environment/Scenes/scripting/ScriptInfo.cs b/OpenSim/Region/Environment/Scenes/scripting/ScriptInfo.cs
index 57df4c4..522a572 100644
--- a/OpenSim/Region/Environment/Scenes/scripting/ScriptInfo.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/ScriptInfo.cs
@@ -32,7 +32,7 @@ using System.Text;
 using OpenSim.Region.Environment.Scenes;

 using OpenSim.Framework.Console;

 

-namespace OpenSim.Scripting

+namespace OpenSim.Region.Enviorment.Scripting

 {

     /// <summary>

     /// Class which provides access to the world

diff --git a/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs b/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs
index 5d1d188..576b7a5 100644
--- a/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs
@@ -29,7 +29,7 @@ using System;
 using System.Collections.Generic;

 using System.Text;

 

-namespace OpenSim.Scripting

+namespace OpenSim.Region.Enviorment.Scripting

 {

     public class ScriptManager

     {