5 files changed, 11 insertions, 14 deletions

diff --git a/OpenSim/OpenSim.Region/Scenes/scripting/Engines/CSharpScriptEngine.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/CSharpScriptEngine.cs
index 870303f..a232b65 100644
--- a/OpenSim/OpenSim.Region/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/OpenSim.Region/Scenes/scripting/Engines/JScriptEngine.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JScriptEngine.cs
index ffae1d7..2d44223 100644
--- a/OpenSim/OpenSim.Region/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/OpenSim.Region/Scenes/scripting/Script.cs b/OpenSim/Region/Environment/Scenes/scripting/Script.cs
index 56bd1db..1e64675 100644
--- a/OpenSim/OpenSim.Region/Scenes/scripting/Script.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/Script.cs
@@ -31,10 +31,10 @@ using System.Text;
 

 using OpenSim.Framework.Console;

 using OpenSim.Framework;

-using OpenSim.Region;

-using OpenSim.Region.Scenes;

+using OpenSim.Region.Environment;

+using OpenSim.Region.Environment.Scenes;

 

-namespace OpenSim.Scripting

+namespace OpenSim.Region.Enviorment.Scripting

 {

     public interface IScript

     {

@@ -54,7 +54,7 @@ namespace OpenSim.Scripting
         public void Initialise(ScriptInfo scriptInfo)

         {

             script = scriptInfo;

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

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

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

         }

 

diff --git a/OpenSim/OpenSim.Region/Scenes/scripting/ScriptInfo.cs b/OpenSim/Region/Environment/Scenes/scripting/ScriptInfo.cs
index cf627dd..522a572 100644
--- a/OpenSim/OpenSim.Region/Scenes/scripting/ScriptInfo.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/ScriptInfo.cs
@@ -29,10 +29,10 @@ using System;
 using System.Collections.Generic;

 using System.Text;

 

-using OpenSim.Region.Scenes;

+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/OpenSim.Region/Scenes/scripting/ScriptManager.cs b/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs
index abffffa..eb1c1d9 100644
--- a/OpenSim/OpenSim.Region/Scenes/scripting/ScriptManager.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs
@@ -29,12 +29,12 @@ using System;
 using System.Collections.Generic;

 using System.Text;

 

-namespace OpenSim.Scripting

+namespace OpenSim.Region.Enviorment.Scripting

 {

     public class ScriptManager

     {

         List<IScript> scripts = new List<IScript>();

-        OpenSim.Region.Scenes.Scene scene;

+        OpenSim.Region.Environment.Scenes.Scene scene;

         Dictionary<string, IScriptCompiler> compilers = new Dictionary<string, IScriptCompiler>();

 

         private void LoadFromCompiler(Dictionary<string, IScript> compiledscripts)

@@ -49,7 +49,7 @@ namespace OpenSim.Scripting
             OpenSim.Framework.Console.MainLog.Instance.Verbose("Finished loading " + compiledscripts.Count.ToString() + " script(s)");

         }

 

-        public ScriptManager(OpenSim.Region.Scenes.Scene world)

+        public ScriptManager(OpenSim.Region.Environment.Scenes.Scene world)

         {

             scene = world;

 

@@ -59,9 +59,6 @@ namespace OpenSim.Scripting
 

             JScriptEngine jscriptCompiler = new JScriptEngine();

             compilers.Add(jscriptCompiler.FileExt(), jscriptCompiler);

-

-            JSharpScriptEngine jsharpCompiler = new JSharpScriptEngine();

-            compilers.Add(jsharpCompiler.FileExt(), jsharpCompiler);

         }

 

         public void Compile(string filename)