4 files changed, 27 insertions, 143 deletions

diff --git a/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj b/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
index 0cfeda9..428f381 100644
--- a/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
+++ b/OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
@@ -82,10 +82,6 @@
       <HintPath>System.Xml.dll</HintPath>

       <Private>False</Private>

     </Reference>

-    <Reference Include="VJSharpCodeProvider" >

-      <HintPath>VJSharpCodeProvider.dll</HintPath>

-      <Private>False</Private>

-    </Reference>

     <Reference Include="XMLRPC.dll" >

       <HintPath>..\..\..\bin\XMLRPC.dll</HintPath>

       <Private>False</Private>

@@ -148,61 +144,58 @@
     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="RegionManager.cs">

-      <SubType>Code</SubType>

-    </Compile>

     <Compile Include="EstateManager.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="ParcelManager.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Scenes\ScenePresence.Body.cs">

+    <Compile Include="RegionManager.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Scenes\SceneEvents.cs">

+    <Compile Include="Scenes\Entity.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Scenes\ScenePresence.Animations.cs">

+    <Compile Include="Scenes\IScenePresenceBody.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Scenes\Scene.PacketHandlers.cs">

+    <Compile Include="Scenes\Primitive.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Scenes\SceneObject.cs">

+    <Compile Include="Scenes\Scene.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Scenes\Primitive.cs">

+    <Compile Include="Scenes\Scene.PacketHandlers.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Scenes\IScenePresenceBody.cs">

+    <Compile Include="Scenes\SceneBase.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Scenes\Entity.cs">

+    <Compile Include="Scenes\SceneEvents.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Scenes\SceneBase.cs">

+    <Compile Include="Scenes\SceneObject.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Scenes\ScenePresence.cs">

+    <Compile Include="Scenes\ScenePresence.Animations.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Scenes\Scene.cs">

+    <Compile Include="Scenes\ScenePresence.Body.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Scenes\scripting\ScriptManager.cs">

+    <Compile Include="Scenes\ScenePresence.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Scenes\scripting\ScriptInfo.cs">

+    <Compile Include="Scenes\scripting\Script.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Scenes\scripting\Script.cs">

+    <Compile Include="Scenes\scripting\ScriptInfo.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Scenes\scripting\Engines\CSharpScriptEngine.cs">

+    <Compile Include="Scenes\scripting\ScriptManager.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Scenes\scripting\Engines\JSharpScriptEngine.cs">

+    <Compile Include="Scenes\scripting\Engines\CSharpScriptEngine.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="Scenes\scripting\Engines\JScriptEngine.cs">

diff --git a/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build b/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build
index fcfc623..2fa5e76 100644
--- a/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build
+++ b/OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build
@@ -11,25 +11,24 @@
             <resources prefix="OpenSim.Region.Environment" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

-                <include name="RegionManager.cs" />

                 <include name="EstateManager.cs" />

                 <include name="ParcelManager.cs" />

-                <include name="Scenes/ScenePresence.Body.cs" />

-                <include name="Scenes/SceneEvents.cs" />

-                <include name="Scenes/ScenePresence.Animations.cs" />

-                <include name="Scenes/Scene.PacketHandlers.cs" />

-                <include name="Scenes/SceneObject.cs" />

-                <include name="Scenes/Primitive.cs" />

-                <include name="Scenes/IScenePresenceBody.cs" />

+                <include name="RegionManager.cs" />

                 <include name="Scenes/Entity.cs" />

+                <include name="Scenes/IScenePresenceBody.cs" />

+                <include name="Scenes/Primitive.cs" />

+                <include name="Scenes/Scene.cs" />

+                <include name="Scenes/Scene.PacketHandlers.cs" />

                 <include name="Scenes/SceneBase.cs" />

+                <include name="Scenes/SceneEvents.cs" />

+                <include name="Scenes/SceneObject.cs" />

+                <include name="Scenes/ScenePresence.Animations.cs" />

+                <include name="Scenes/ScenePresence.Body.cs" />

                 <include name="Scenes/ScenePresence.cs" />

-                <include name="Scenes/Scene.cs" />

-                <include name="Scenes/scripting/ScriptManager.cs" />

-                <include name="Scenes/scripting/ScriptInfo.cs" />

                 <include name="Scenes/scripting/Script.cs" />

+                <include name="Scenes/scripting/ScriptInfo.cs" />

+                <include name="Scenes/scripting/ScriptManager.cs" />

                 <include name="Scenes/scripting/Engines/CSharpScriptEngine.cs" />

-                <include name="Scenes/scripting/Engines/JSharpScriptEngine.cs" />

                 <include name="Scenes/scripting/Engines/JScriptEngine.cs" />

             </sources>

             <references basedir="${project::get-base-directory()}">

@@ -52,7 +51,6 @@
                 <include name="../../../bin/OpenSim.Region.Terrain.BasicTerrain.dll" />

                 <include name="System.dll" />

                 <include name="System.Xml.dll" />

-                <include name="VJSharpCodeProvider.dll" />

                 <include name="../../../bin/XMLRPC.dll" />

             </references>

         </csc>

diff --git a/OpenSim/Region/Environment/Scenes/scripting/Engines/JSharpScriptEngine.cs b/OpenSim/Region/Environment/Scenes/scripting/Engines/JSharpScriptEngine.cs
deleted file mode 100644
index 51b1512..0000000
--- a/OpenSim/Region/Environment/Scenes/scripting/Engines/JSharpScriptEngine.cs
+++ /dev/null
@@ -1,104 +0,0 @@
-/*

-* Copyright (c) Contributors, http://www.openmetaverse.org/

-* See CONTRIBUTORS.TXT for a full list of copyright holders.

-*

-* Redistribution and use in source and binary forms, with or without

-* modification, are permitted provided that the following conditions are met:

-*     * Redistributions of source code must retain the above copyright

-*       notice, this list of conditions and the following disclaimer.

-*     * Redistributions in binary form must reproduce the above copyright

-*       notice, this list of conditions and the following disclaimer in the

-*       documentation and/or other materials provided with the distribution.

-*     * Neither the name of the OpenSim Project nor the

-*       names of its contributors may be used to endorse or promote products

-*       derived from this software without specific prior written permission.

-*

-* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY

-* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

-* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

-* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY

-* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

-* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

-* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND

-* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

-* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-* 

-*/

-using System;

-using System.Collections.Generic;

-using System.Text;

-

-// Compilation stuff

-using System.CodeDom;

-using System.CodeDom.Compiler;

-using Microsoft.VJSharp;

-

-namespace OpenSim.Region.Enviorment.Scripting

-{

-    public class JSharpScriptEngine : IScriptCompiler

-    {

-        public string FileExt()

-        {

-            return ".jsl";

-        }

-

-        private Dictionary<string, IScript> LoadDotNetScript(ICodeCompiler compiler, string filename)

-        {

-            CompilerParameters compilerParams = new CompilerParameters();

-            CompilerResults compilerResults;

-            compilerParams.GenerateExecutable = false;

-            compilerParams.GenerateInMemory = true;

-            compilerParams.IncludeDebugInformation = false;

-            compilerParams.ReferencedAssemblies.Add("OpenSim.Region.dll");

-            compilerParams.ReferencedAssemblies.Add("OpenSim.Framework.dll");

-            compilerParams.ReferencedAssemblies.Add("libsecondlife.dll");

-            compilerParams.ReferencedAssemblies.Add("System.dll");

-

-            compilerResults = compiler.CompileAssemblyFromFile(compilerParams, filename);

-

-            if (compilerResults.Errors.Count > 0)

-            {

-                OpenSim.Framework.Console.MainLog.Instance.Error("Compile errors");

-                foreach (CompilerError error in compilerResults.Errors)

-                {

-                    OpenSim.Framework.Console.MainLog.Instance.Error(error.Line.ToString() + ": " + error.ErrorText.ToString());

-                }

-            }

-            else

-            {

-                Dictionary<string, IScript> scripts = new Dictionary<string, IScript>();

-

-                foreach (Type pluginType in compilerResults.CompiledAssembly.GetExportedTypes())

-                {

-                    Type testInterface = pluginType.GetInterface("IScript", true);

-

-                    if (testInterface != null)

-                    {

-                        IScript script = (IScript)compilerResults.CompiledAssembly.CreateInstance(pluginType.ToString());

-

-                        string scriptName = "J#/" + script.getName();

-                        Console.WriteLine("Script: " + scriptName + " loaded.");

-

-                        if (!scripts.ContainsKey(scriptName))

-                        {

-                            scripts.Add(scriptName, script);

-                        }

-                        else

-                        {

-                            scripts[scriptName] = script;

-                        }

-                    }

-                }

-                return scripts;

-            }

-            return null;

-        }

-

-        public Dictionary<string, IScript> compile(string filename)

-        {

-            VJSharpCodeProvider jsharpProvider = new VJSharpCodeProvider();

-            return LoadDotNetScript(jsharpProvider.CreateCompiler(), filename);

-        }

-    }

-}

diff --git a/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs b/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs
index 576b7a5..eb1c1d9 100644
--- a/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs
+++ b/OpenSim/Region/Environment/Scenes/scripting/ScriptManager.cs
@@ -59,9 +59,6 @@ namespace OpenSim.Region.Enviorment.Scripting
 

             JScriptEngine jscriptCompiler = new JScriptEngine();

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

-

-            JSharpScriptEngine jsharpCompiler = new JSharpScriptEngine();

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

         }

 

         public void Compile(string filename)