16 files changed, 78 insertions, 194 deletions
diff --git a/OpenSim/Region/Application/OpenSim.csproj b/OpenSim/Region/Application/OpenSim.csproj
index f5da23d..bec85cc 100644
--- a/OpenSim/Region/Application/OpenSim.csproj
+++ b/OpenSim/Region/Application/OpenSim.csproj
@@ -170,15 +170,15 @@
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
-    <Compile Include="VersionInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
    <Compile Include="Application.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="OpenSimMain.cs">
      <SubType>Code</SubType>
    </Compile>
+    <Compile Include="VersionInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
  </ItemGroup>
  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
  <PropertyGroup>
diff --git a/OpenSim/Region/Application/OpenSim.exe.build b/OpenSim/Region/Application/OpenSim.exe.build
index 9890cfa..6c7d7ac 100644
--- a/OpenSim/Region/Application/OpenSim.exe.build
+++ b/OpenSim/Region/Application/OpenSim.exe.build
@@ -11,9 +11,9 @@
            <resources prefix="OpenSim" dynamicprefix="true" >
            </resources>
            <sources failonempty="true">
-                <include name="VersionInfo.cs" />
                <include name="Application.cs" />
                <include name="OpenSimMain.cs" />
+                <include name="VersionInfo.cs" />
            </sources>
            <references basedir="${project::get-base-directory()}">
                <lib>
diff --git a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj
index bb21365..4667d52 100644
--- a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj
+++ b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj
@@ -96,40 +96,40 @@
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
-    <Compile Include="LLSDCapsDetails.cs">
+    <Compile Include="Caps.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="LLSDArray.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="LLSDEmpty.cs">
+    <Compile Include="LLSDCapEvent.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="LLSDTest.cs">
+    <Compile Include="LLSDCapsDetails.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="LLSDUploadReply.cs">
+    <Compile Include="LLSDEmpty.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="LLSDType.cs">
+    <Compile Include="LLSDHelpers.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="LLSDCapEvent.cs">
+    <Compile Include="LLSDMapLayer.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="LLSDMapRequest.cs">
+    <Compile Include="LLSDMapLayerResponse.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Caps.cs">
+    <Compile Include="LLSDMapRequest.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="LLSDMapLayerResponse.cs">
+    <Compile Include="LLSDTest.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="LLSDMapLayer.cs">
+    <Compile Include="LLSDType.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="LLSDHelpers.cs">
+    <Compile Include="LLSDUploadReply.cs">
      <SubType>Code</SubType>
    </Compile>
  </ItemGroup>
diff --git a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build
index 817e5b0..a091b5c 100644
--- a/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build
+++ b/OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build
@@ -11,18 +11,18 @@
            <resources prefix="OpenSim.Region.Capabilities" dynamicprefix="true" >
            </resources>
            <sources failonempty="true">
-                <include name="LLSDCapsDetails.cs" />
+                <include name="Caps.cs" />
                <include name="LLSDArray.cs" />
+                <include name="LLSDCapEvent.cs" />
+                <include name="LLSDCapsDetails.cs" />
                <include name="LLSDEmpty.cs" />
+                <include name="LLSDHelpers.cs" />
+                <include name="LLSDMapLayer.cs" />
+                <include name="LLSDMapLayerResponse.cs" />
+                <include name="LLSDMapRequest.cs" />
                <include name="LLSDTest.cs" />
-                <include name="LLSDUploadReply.cs" />
                <include name="LLSDType.cs" />
-                <include name="LLSDCapEvent.cs" />
+                <include name="LLSDUploadReply.cs" />
-                <include name="LLSDMapRequest.cs" />
-                <include name="Caps.cs" />
-                <include name="LLSDMapLayerResponse.cs" />
-                <include name="LLSDMapLayer.cs" />
-                <include name="LLSDHelpers.cs" />
            </sources>
            <references basedir="${project::get-base-directory()}">
                <lib>
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
index e679174..3093eb0 100644
--- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
@@ -122,34 +122,34 @@
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
-    <Compile Include="ClientView.AgentAssetUpload.cs">
+    <Compile Include="ClientStackNetworkHandler.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="ClientStackNetworkHandler.cs">
+    <Compile Include="ClientView.AgentAssetUpload.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="PacketServer.cs">
+    <Compile Include="ClientView.API.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="UDPServer.cs">
+    <Compile Include="ClientView.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="ClientViewBase.cs">
+    <Compile Include="ClientView.PacketHandlers.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="ClientView.cs">
+    <Compile Include="ClientView.ProcessPackets.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="ClientView.PacketHandlers.cs">
+    <Compile Include="ClientViewBase.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="RegionApplicationBase.cs">
+    <Compile Include="PacketServer.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="ClientView.API.cs">
+    <Compile Include="RegionApplicationBase.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="ClientView.ProcessPackets.cs">
+    <Compile Include="UDPServer.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="Assets\InventoryCache.cs">
diff --git a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
index 95422c8..f76a4c8 100644
--- a/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
+++ b/OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
@@ -11,16 +11,16 @@
            <resources prefix="OpenSim.Region.ClientStack" dynamicprefix="true" >
            </resources>
            <sources failonempty="true">
-                <include name="ClientView.AgentAssetUpload.cs" />
                <include name="ClientStackNetworkHandler.cs" />
-                <include name="PacketServer.cs" />
+                <include name="ClientView.AgentAssetUpload.cs" />
-                <include name="UDPServer.cs" />
+                <include name="ClientView.API.cs" />
-                <include name="ClientViewBase.cs" />
                <include name="ClientView.cs" />
                <include name="ClientView.PacketHandlers.cs" />
-                <include name="RegionApplicationBase.cs" />
-                <include name="ClientView.API.cs" />
                <include name="ClientView.ProcessPackets.cs" />
+                <include name="ClientViewBase.cs" />
+                <include name="PacketServer.cs" />
+                <include name="RegionApplicationBase.cs" />
+                <include name="UDPServer.cs" />
                <include name="Assets/InventoryCache.cs" />
            </sources>
            <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
index 200fa3a..0a15a49 100644
--- a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
+++ b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
@@ -98,13 +98,13 @@
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
-    <Compile Include="LocalBackEndServices.cs">
+    <Compile Include="CommunicationsLocal.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="LocalUserServices.cs">
+    <Compile Include="LocalBackEndServices.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="CommunicationsLocal.cs">
+    <Compile Include="LocalUserServices.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="Properties\AssemblyInfo.cs">
diff --git a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build
index 60a90bd..3cac9d3 100644
--- a/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build
+++ b/OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build
@@ -11,9 +11,9 @@
            <resources prefix="OpenSim.Region.Communications.Local" dynamicprefix="true" >
            </resources>
            <sources failonempty="true">
+                <include name="CommunicationsLocal.cs" />
                <include name="LocalBackEndServices.cs" />
                <include name="LocalUserServices.cs" />
-                <include name="CommunicationsLocal.cs" />
                <include name="Properties/AssemblyInfo.cs" />
            </sources>
            <references basedir="${project::get-base-directory()}">
diff --git a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
index 0a9e5fb..d6abd13 100644
--- a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
+++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
@@ -116,13 +116,13 @@
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
-    <Compile Include="OGS1InterSimComms.cs">
+    <Compile Include="CommunicationsOGS1.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="OGS1GridServices.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="CommunicationsOGS1.cs">
+    <Compile Include="OGS1InterSimComms.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="OGS1UserServices.cs">
diff --git a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build
index 2176b14..04d61b9 100644
--- a/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build
+++ b/OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build
@@ -11,9 +11,9 @@
            <resources prefix="OpenSim.Region.Communications.OGS1" dynamicprefix="true" >
            </resources>
            <sources failonempty="true">
-                <include name="OGS1InterSimComms.cs" />
-                <include name="OGS1GridServices.cs" />
                <include name="CommunicationsOGS1.cs" />
+                <include name="OGS1GridServices.cs" />
+                <include name="OGS1InterSimComms.cs" />
                <include name="OGS1UserServices.cs" />
                <include name="Properties/AssemblyInfo.cs" />
            </sources>
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="RegionManager.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="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)
diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj
index 716fd57..147158c 100644
--- a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj
@@ -93,6 +93,9 @@
    <Compile Include="AssemblyInfo.cs">
      <SubType>Code</SubType>
    </Compile>
+    <Compile Include="Db4LocalStorage.cs">
+      <SubType>Code</SubType>
+    </Compile>
    <Compile Include="MapStorage.cs">
      <SubType>Code</SubType>
    </Compile>
@@ -102,9 +105,6 @@
    <Compile Include="UUIDPrimQuery.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Db4LocalStorage.cs">
-      <SubType>Code</SubType>
-    </Compile>
  </ItemGroup>
  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
  <PropertyGroup>
diff --git a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build
index 112ff1c..fc9f055 100644
--- a/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build
+++ b/OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build
@@ -12,10 +12,10 @@
            </resources>
            <sources failonempty="true">
                <include name="AssemblyInfo.cs" />
+                <include name="Db4LocalStorage.cs" />
                <include name="MapStorage.cs" />
                <include name="UUIDParcelQuery.cs" />
                <include name="UUIDPrimQuery.cs" />
-                <include name="Db4LocalStorage.cs" />
            </sources>
            <references basedir="${project::get-base-directory()}">
                <lib>