2 files changed, 60 insertions, 48 deletions
diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.csproj b/OpenSim/OpenSim.Region/OpenSim.Region.csproj
index 4131142..79f204d 100644
--- a/OpenSim/OpenSim.Region/OpenSim.Region.csproj
+++ b/OpenSim/OpenSim.Region/OpenSim.Region.csproj
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <ProjectType>Local</ProjectType>
    <ProductVersion>8.0.50727</ProductVersion>
@@ -6,8 +6,7 @@
    <ProjectGuid>{196916AF-0000-0000-0000-000000000000}</ProjectGuid>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
+    <ApplicationIcon></ApplicationIcon>
-    </ApplicationIcon>
    <AssemblyKeyContainerName>
    </AssemblyKeyContainerName>
    <AssemblyName>OpenSim.Region</AssemblyName>
@@ -16,11 +15,9 @@
    <DefaultTargetSchema>IE50</DefaultTargetSchema>
    <DelaySign>false</DelaySign>
    <OutputType>Library</OutputType>
-    <AppDesignerFolder>
+    <AppDesignerFolder></AppDesignerFolder>
-    </AppDesignerFolder>
    <RootNamespace>OpenSim.Region</RootNamespace>
-    <StartupObject>
+    <StartupObject></StartupObject>
-    </StartupObject>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
  </PropertyGroup>
@@ -31,8 +28,7 @@
    <ConfigurationOverrideFile>
    </ConfigurationOverrideFile>
    <DefineConstants>TRACE;DEBUG</DefineConstants>
-    <DocumentationFile>
+    <DocumentationFile></DocumentationFile>
-    </DocumentationFile>
    <DebugSymbols>True</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>False</Optimize>
@@ -41,8 +37,7 @@
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
    <WarningLevel>4</WarningLevel>
-    <NoWarn>
+    <NoWarn></NoWarn>
-    </NoWarn>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -51,8 +46,7 @@
    <ConfigurationOverrideFile>
    </ConfigurationOverrideFile>
    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile>
+    <DocumentationFile></DocumentationFile>
-    </DocumentationFile>
    <DebugSymbols>False</DebugSymbols>
    <FileAlignment>4096</FileAlignment>
    <Optimize>True</Optimize>
@@ -61,88 +55,92 @@
    <RemoveIntegerChecks>False</RemoveIntegerChecks>
    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
    <WarningLevel>4</WarningLevel>
-    <NoWarn>
+    <NoWarn></NoWarn>
-    </NoWarn>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="Axiom.MathLib.dll">
+    <Reference Include="Axiom.MathLib.dll" >
      <HintPath>..\..\bin\Axiom.MathLib.dll</HintPath>
      <Private>False</Private>
    </Reference>
-    <Reference Include="Db4objects.Db4o.dll">
+    <Reference Include="Db4objects.Db4o.dll" >
      <HintPath>..\..\bin\Db4objects.Db4o.dll</HintPath>
      <Private>False</Private>
    </Reference>
-    <Reference Include="libsecondlife.dll">
+    <Reference Include="libsecondlife.dll" >
      <HintPath>..\..\bin\libsecondlife.dll</HintPath>
      <Private>False</Private>
    </Reference>
-    <Reference Include="Microsoft.JScript" />
+    <Reference Include="Microsoft.JScript" >
-    <Reference Include="System">
+      <HintPath>Microsoft.JScript.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System" >
      <HintPath>System.dll</HintPath>
      <Private>False</Private>
    </Reference>
-    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" >
-    <Reference Include="System.Xml">
      <HintPath>System.Xml.dll</HintPath>
      <Private>False</Private>
    </Reference>
-    <Reference Include="VJSharpCodeProvider" />
+    <Reference Include="VJSharpCodeProvider" >
+      <HintPath>VJSharpCodeProvider.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\..\Common\OpenGrid.Framework.Communications\OpenGrid.Framework.Communications.csproj">
      <Name>OpenGrid.Framework.Communications</Name>
      <Project>{683344D5-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+                        <Private>False</Private>
    </ProjectReference>
    <ProjectReference Include="..\OpenSim.Caches\OpenSim.Caches.csproj">
      <Name>OpenSim.Caches</Name>
      <Project>{1938EB12-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+                        <Private>False</Private>
    </ProjectReference>
    <ProjectReference Include="..\..\Common\OpenSim.Framework\OpenSim.Framework.csproj">
      <Name>OpenSim.Framework</Name>
      <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+                        <Private>False</Private>
    </ProjectReference>
    <ProjectReference Include="..\..\Common\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
      <Name>OpenSim.Framework.Console</Name>
      <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+                        <Private>False</Private>
    </ProjectReference>
    <ProjectReference Include="..\..\Common\OpenSim.GenericConfig\Xml\OpenSim.GenericConfig.Xml.csproj">
      <Name>OpenSim.GenericConfig.Xml</Name>
      <Project>{E88EF749-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+                        <Private>False</Private>
    </ProjectReference>
    <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj">
      <Name>OpenSim.Physics.Manager</Name>
      <Project>{8BE16150-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+                        <Private>False</Private>
    </ProjectReference>
    <ProjectReference Include="..\..\Common\OpenSim.Servers\OpenSim.Servers.csproj">
      <Name>OpenSim.Servers</Name>
      <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+                        <Private>False</Private>
    </ProjectReference>
    <ProjectReference Include="..\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj">
      <Name>OpenSim.Terrain.BasicTerrain</Name>
      <Project>{2270B8FE-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+                        <Private>False</Private>
    </ProjectReference>
    <ProjectReference Include="..\..\Common\XmlRpcCS\XMLRPC.csproj">
      <Name>XMLRPC</Name>
      <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>
      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
-      <Private>False</Private>
+                        <Private>False</Private>
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
@@ -179,7 +177,9 @@
    <Compile Include="Scenes\SceneBase.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Scenes\SceneEvents.cs" />
+    <Compile Include="Scenes\SceneEvents.cs">
+      <SubType>Code</SubType>
+    </Compile>
    <Compile Include="Scenes\SceneObject.cs">
      <SubType>Code</SubType>
    </Compile>
@@ -192,15 +192,24 @@
    <Compile Include="Scenes\ScenePresence.cs">
      <SubType>Code</SubType>
    </Compile>
-    <Compile Include="Scenes\Scripting\Engines\CSharpScriptEngine.cs" />
+    <Compile Include="Scenes\scripting\Script.cs">
-    <Compile Include="Scenes\Scripting\Engines\JScriptEngine.cs" />
+      <SubType>Code</SubType>
-    <Compile Include="Scenes\Scripting\Engines\JSharpScriptEngine.cs" />
+    </Compile>
-    <Compile Include="Scenes\Scripting\Script.cs" />
+    <Compile Include="Scenes\scripting\ScriptInfo.cs">
-    <Compile Include="Scenes\Scripting\ScriptInfo.cs" />
+      <SubType>Code</SubType>
-    <Compile Include="Scenes\Scripting\ScriptManager.cs" />
+    </Compile>
-  </ItemGroup>
+    <Compile Include="Scenes\scripting\ScriptManager.cs">
-  <ItemGroup>
+      <SubType>Code</SubType>
-    <Folder Include="Scenes\Scripting\CSharpScripts\" />
+    </Compile>
+    <Compile Include="Scenes\scripting\Engines\CSharpScriptEngine.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\scripting\Engines\JScriptEngine.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Scenes\scripting\Engines\JSharpScriptEngine.cs">
+      <SubType>Code</SubType>
+    </Compile>
  </ItemGroup>
  <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
  <PropertyGroup>
@@ -209,4 +218,4 @@
    <PostBuildEvent>
    </PostBuildEvent>
  </PropertyGroup>
-</Project>
-\ No newline at end of file
+</Project>
diff --git a/OpenSim/OpenSim.Region/OpenSim.Region.dll.build b/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
index d2c3c2c..926b9ed 100644
--- a/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
+++ b/OpenSim/OpenSim.Region/OpenSim.Region.dll.build
@@ -22,16 +22,17 @@
                <include name="Scenes/Scene.PacketHandlers.cs" />
                <include name="Scenes/Scene.Scripting.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/scripting/IScriptContext.cs" />
-                <include name="Scenes/scripting/IScriptEntity.cs" />
-                <include name="Scenes/scripting/IScriptHandler.cs" />
                <include name="Scenes/scripting/Script.cs" />
-                <include name="Scenes/scripting/ScriptFactory.cs" />
+                <include name="Scenes/scripting/ScriptInfo.cs" />
-                <include name="Scenes/scripting/Scripts/FollowRandomAvatar.cs" />
+                <include name="Scenes/scripting/ScriptManager.cs" />
+                <include name="Scenes/scripting/Engines/CSharpScriptEngine.cs" />
+                <include name="Scenes/scripting/Engines/JScriptEngine.cs" />
+                <include name="Scenes/scripting/Engines/JSharpScriptEngine.cs" />
            </sources>
            <references basedir="${project::get-base-directory()}">
                <lib>
@@ -41,6 +42,7 @@
                <include name="../../bin/Axiom.MathLib.dll" />
                <include name="../../bin/Db4objects.Db4o.dll" />
                <include name="../../bin/libsecondlife.dll" />
+                <include name="Microsoft.JScript.dll" />
                <include name="../../bin/OpenGrid.Framework.Communications.dll" />
                <include name="../../bin/OpenSim.Caches.dll" />
                <include name="../../bin/OpenSim.Framework.dll" />
@@ -51,6 +53,7 @@
                <include name="../../bin/OpenSim.Terrain.BasicTerrain.dll" />
                <include name="System.dll" />
                <include name="System.Xml.dll" />
+                <include name="VJSharpCodeProvider.dll" />
                <include name="../../bin/XMLRPC.dll" />
            </references>
        </csc>