* TortoiseSVN has an annoying red icon over stuff, this means I probably changed something.

* Updated solution files & build files via prebuild.

2 files changed, 114 insertions, 127 deletions

diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim.RegionServer/OpenSim.RegionServer.csproj
index 100622b..93285b4 100644
--- a/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ b/OpenSim.RegionServer/OpenSim.RegionServer.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>{632E1BFD-0000-0000-0000-000000000000}</ProjectGuid>

     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ApplicationIcon>

-    </ApplicationIcon>

+    <ApplicationIcon></ApplicationIcon>

     <AssemblyKeyContainerName>

     </AssemblyKeyContainerName>

     <AssemblyName>OpenSim.RegionServer</AssemblyName>

@@ -16,11 +15,9 @@
     <DefaultTargetSchema>IE50</DefaultTargetSchema>

     <DelaySign>false</DelaySign>

     <OutputType>Library</OutputType>

-    <AppDesignerFolder>

-    </AppDesignerFolder>

+    <AppDesignerFolder></AppDesignerFolder>

     <RootNamespace>OpenSim.RegionServer</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,28 +55,26 @@
     <RemoveIntegerChecks>False</RemoveIntegerChecks>

     <TreatWarningsAsErrors>False</TreatWarningsAsErrors>

     <WarningLevel>4</WarningLevel>

-    <NoWarn>

-    </NoWarn>

+    <NoWarn></NoWarn>

   </PropertyGroup>

   <ItemGroup>

-    <Reference Include="System">

+    <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="libsecondlife.dll">

+    <Reference Include="libsecondlife.dll" >

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

       <Private>False</Private>

     </Reference>

-    <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>

@@ -92,43 +84,43 @@
       <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="..\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="..\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="..\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="..\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="..\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>

@@ -169,16 +161,13 @@
       <SubType>Code</SubType>

     </Compile>

     <Compile Include="SimClient.Grid.cs">

-      <DependentUpon>SimClient.cs</DependentUpon>

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="SimClient.PacketHandlers.cs">

       <SubType>Code</SubType>

-      <DependentUpon>SimClient.cs</DependentUpon>

     </Compile>

     <Compile Include="SimClient.ProcessPackets.cs">

       <SubType>Code</SubType>

-      <DependentUpon>SimClient.cs</DependentUpon>

     </Compile>

     <Compile Include="SimClientBase.cs">

       <SubType>Code</SubType>

@@ -206,14 +195,12 @@
     </Compile>

     <Compile Include="world\Avatar.Client.cs">

       <SubType>Code</SubType>

-      <DependentUpon>Avatar.cs</DependentUpon>

     </Compile>

     <Compile Include="world\Avatar.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="world\Avatar.Update.cs">

       <SubType>Code</SubType>

-      <DependentUpon>Avatar.cs</DependentUpon>

     </Compile>

     <Compile Include="world\AvatarAnimations.cs">

       <SubType>Code</SubType>

@@ -235,11 +222,12 @@
     </Compile>

     <Compile Include="world\World.PacketHandlers.cs">

       <SubType>Code</SubType>

-      <DependentUpon>World.cs</DependentUpon>

     </Compile>

     <Compile Include="world\World.Scripting.cs">

       <SubType>Code</SubType>

-      <DependentUpon>World.cs</DependentUpon>

+    </Compile>

+    <Compile Include="world\WorldBase.cs">

+      <SubType>Code</SubType>

     </Compile>

     <Compile Include="world\scripting\IScriptContext.cs">

       <SubType>Code</SubType>

@@ -259,7 +247,6 @@
     <Compile Include="world\scripting\Scripts\FollowRandomAvatar.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="world\WorldBase.cs" />

   </ItemGroup>

   <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />

   <PropertyGroup>

@@ -268,4 +255,4 @@
     <PostBuildEvent>

     </PostBuildEvent>

   </PropertyGroup>

-</Project>
\ No newline at end of file
+</Project>

diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
index 454bccb..35985ac 100644
--- a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
@@ -1,90 +1,90 @@
-<?xml version="1.0" ?>
-<project name="OpenSim.RegionServer" default="build">
-    <target name="build">
-        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
-        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
-        <copy todir="${project::get-base-directory()}/${build.dir}">
-            <fileset basedir="${project::get-base-directory()}">
-            </fileset>
-        </copy>
-        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
-            <resources prefix="OpenSim.RegionServer" dynamicprefix="true" >
-            </resources>
-            <sources failonempty="true">
-                <include name="AgentAssetUpload.cs" />
-                <include name="AuthenticateSessionsBase.cs" />
-                <include name="AuthenticateSessionsLocal.cs" />
-                <include name="AuthenticateSessionsRemote.cs" />
-                <include name="Grid.cs" />
-                <include name="OpenSimMain.cs" />
-                <include name="OpenSimNetworkHandler.cs" />
-                <include name="PacketServer.cs" />
-                <include name="RegionInfo.cs" />
-                <include name="RegionInfoBase.cs" />
-                <include name="RegionServerBase.cs" />
-                <include name="SimClient.Grid.cs" />
-                <include name="SimClient.PacketHandlers.cs" />
-                <include name="SimClient.ProcessPackets.cs" />
-                <include name="SimClient.cs" />
-                <include name="SimClientBase.cs" />
-                <include name="UDPServer.cs" />
-                <include name="VersionInfo.cs" />
-                <include name="Assets/AssetCache.cs" />
-                <include name="Assets/InventoryCache.cs" />
-                <include name="CAPS/AdminWebFront.cs" />
-                <include name="types/Mesh.cs" />
-                <include name="types/Triangle.cs" />
-                <include name="world/Avatar.Client.cs" />
-                <include name="world/Avatar.Update.cs" />
-                <include name="world/Avatar.cs" />
-                <include name="world/AvatarAnimations.cs" />
-                <include name="world/Entity.cs" />
-                <include name="world/Primitive.cs" />
-                <include name="world/Primitive2.cs" />
-                <include name="world/SceneObject.cs" />
-                <include name="world/World.PacketHandlers.cs" />
-                <include name="world/World.Scripting.cs" />
-                <include name="world/World.cs" />
-                <include name="world/WorldBase.cs" />
-                <include name="world/scripting/IScriptContext.cs" />
-                <include name="world/scripting/IScriptEntity.cs" />
-                <include name="world/scripting/IScriptHandler.cs" />
-                <include name="world/scripting/Script.cs" />
-                <include name="world/scripting/ScriptFactory.cs" />
-                <include name="world/scripting/Scripts/FollowRandomAvatar.cs" />
-            </sources>
-            <references basedir="${project::get-base-directory()}">
-                <lib>
-                    <include name="${project::get-base-directory()}" />
-                    <include name="${project::get-base-directory()}/${build.dir}" />
-                </lib>
-                <include name="System.dll" />
-                <include name="System.Xml.dll" />
-                <include name="../bin/libsecondlife.dll" />
-                <include name="../bin/Axiom.MathLib.dll" />
-                <include name="../bin/Db4objects.Db4o.dll" />
-                <include name="../bin/OpenSim.Terrain.BasicTerrain.dll" />
-                <include name="../bin/OpenSim.Framework.dll" />
-                <include name="../bin/OpenSim.Framework.Console.dll" />
-                <include name="../bin/OpenSim.GenericConfig.Xml.dll" />
-                <include name="../bin/OpenSim.Physics.Manager.dll" />
-                <include name="../bin/OpenSim.Servers.dll" />
-                <include name="../bin/XMLRPC.dll" />
-            </references>
-        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../bin/"/>
-        <copy todir="${project::get-base-directory()}/../bin/">
-            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
-                <include name="*.dll"/>
-                <include name="*.exe"/>
-            </fileset>
-        </copy>
-    </target>
-    <target name="clean">
-        <delete dir="${bin.dir}" failonerror="false" />
-        <delete dir="${obj.dir}" failonerror="false" />
-    </target>
-    <target name="doc" description="Creates documentation.">
-    </target>
-</project>
+<?xml version="1.0" ?>

+<project name="OpenSim.RegionServer" default="build">

+    <target name="build">

+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />

+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />

+        <copy todir="${project::get-base-directory()}/${build.dir}">

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

+            </fileset>

+        </copy>

+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">

+            <resources prefix="OpenSim.RegionServer" dynamicprefix="true" >

+            </resources>

+            <sources failonempty="true">

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

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

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

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

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

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

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

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

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

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

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

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

+                <include name="SimClient.Grid.cs" />

+                <include name="SimClient.PacketHandlers.cs" />

+                <include name="SimClient.ProcessPackets.cs" />

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

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

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

+                <include name="Assets/AssetCache.cs" />

+                <include name="Assets/InventoryCache.cs" />

+                <include name="CAPS/AdminWebFront.cs" />

+                <include name="types/Mesh.cs" />

+                <include name="types/Triangle.cs" />

+                <include name="world/Avatar.Client.cs" />

+                <include name="world/Avatar.cs" />

+                <include name="world/Avatar.Update.cs" />

+                <include name="world/AvatarAnimations.cs" />

+                <include name="world/Entity.cs" />

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

+                <include name="world/Primitive2.cs" />

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

+                <include name="world/World.cs" />

+                <include name="world/World.PacketHandlers.cs" />

+                <include name="world/World.Scripting.cs" />

+                <include name="world/WorldBase.cs" />

+                <include name="world/scripting/IScriptContext.cs" />

+                <include name="world/scripting/IScriptEntity.cs" />

+                <include name="world/scripting/IScriptHandler.cs" />

+                <include name="world/scripting/Script.cs" />

+                <include name="world/scripting/ScriptFactory.cs" />

+                <include name="world/scripting/Scripts/FollowRandomAvatar.cs" />

+            </sources>

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

+                <lib>

+                    <include name="${project::get-base-directory()}" />

+                    <include name="${project::get-base-directory()}/${build.dir}" />

+                </lib>

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

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

+                <include name="../bin/libsecondlife.dll" />

+                <include name="../bin/Axiom.MathLib.dll" />

+                <include name="../bin/Db4objects.Db4o.dll" />

+                <include name="../bin/OpenSim.Terrain.BasicTerrain.dll" />

+                <include name="../bin/OpenSim.Framework.dll" />

+                <include name="../bin/OpenSim.Framework.Console.dll" />

+                <include name="../bin/OpenSim.GenericConfig.Xml.dll" />

+                <include name="../bin/OpenSim.Physics.Manager.dll" />

+                <include name="../bin/OpenSim.Servers.dll" />

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

+            </references>

+        </csc>

+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />

+        <mkdir dir="${project::get-base-directory()}/../bin/"/>

+        <copy todir="${project::get-base-directory()}/../bin/">

+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >

+                <include name="*.dll"/>

+                <include name="*.exe"/>

+            </fileset>

+        </copy>

+    </target>

+    <target name="clean">

+        <delete dir="${bin.dir}" failonerror="false" />

+        <delete dir="${obj.dir}" failonerror="false" />

+    </target>

+    <target name="doc" description="Creates documentation.">

+    </target>

+</project>