2 files changed, 129 insertions, 128 deletions

diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
index 52bd9d8..256d3e1 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.csproj
@@ -124,10 +124,10 @@
     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

-    <Compile Include="OpenSimMain.cs">

+    <Compile Include="AgentAssetUpload.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="UDPServer.cs">

+    <Compile Include="AuthenticateSessionsBase.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="AuthenticateSessionsLocal.cs">

@@ -136,61 +136,67 @@
     <Compile Include="AuthenticateSessionsRemote.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="OpenSimNetworkHandler.cs">

+    <Compile Include="ClientView.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Grid.cs">

+    <Compile Include="ClientView.Grid.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="ClientView.Grid.cs">

+    <Compile Include="ClientView.PacketHandlers.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="PacketServer.cs">

+    <Compile Include="ClientView.ProcessPackets.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="RegionInfo.cs">

+    <Compile Include="ClientViewBase.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="ClientView.PacketHandlers.cs">

+    <Compile Include="Grid.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="AuthenticateSessionsBase.cs">

+    <Compile Include="OpenSimMain.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="VersionInfo.cs">

+    <Compile Include="OpenSimNetworkHandler.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="AgentAssetUpload.cs">

+    <Compile Include="PacketServer.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="ClientViewBase.cs">

+    <Compile Include="RegionInfo.cs">

+      <SubType>Code</SubType>

+    </Compile>

+    <Compile Include="RegionInfoBase.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="RegionServerBase.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="ClientView.cs">

+    <Compile Include="UDPServer.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="RegionInfoBase.cs">

+    <Compile Include="VersionInfo.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="ClientView.ProcessPackets.cs">

+    <Compile Include="Assets\AssetCache.cs">

+      <SubType>Code</SubType>

+    </Compile>

+    <Compile Include="Assets\InventoryCache.cs">

       <SubType>Code</SubType>

     </Compile>

     <Compile Include="CAPS\AdminWebFront.cs">

       <SubType>Code</SubType>

     </Compile>

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

+    <Compile Include="types\Mesh.cs">

       <SubType>Code</SubType>

     </Compile>

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

+    <Compile Include="types\Triangle.cs">

       <SubType>Code</SubType>

     </Compile>

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

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

       <SubType>Code</SubType>

     </Compile>

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

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

       <SubType>Code</SubType>

     </Compile>

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

@@ -199,55 +205,49 @@
     <Compile Include="world\AvatarAnimations.cs">

       <SubType>Code</SubType>

     </Compile>

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

-      <SubType>Code</SubType>

-    </Compile>

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

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

       <SubType>Code</SubType>

     </Compile>

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

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

       <SubType>Code</SubType>

     </Compile>

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

       <SubType>Code</SubType>

     </Compile>

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

-      <SubType>Code</SubType>

-    </Compile>

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

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="world\ParcelManager.cs">

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

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="world\scripting\IScriptHandler.cs">

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

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="world\scripting\ScriptFactory.cs">

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

       <SubType>Code</SubType>

     </Compile>

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

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

       <SubType>Code</SubType>

     </Compile>

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

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

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="world\scripting\IScriptEntity.cs">

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

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="world\scripting\Scripts\FollowRandomAvatar.cs">

+    <Compile Include="world\scripting\IScriptEntity.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Assets\InventoryCache.cs">

+    <Compile Include="world\scripting\IScriptHandler.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="Assets\AssetCache.cs">

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

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="types\Mesh.cs">

+    <Compile Include="world\scripting\ScriptFactory.cs">

       <SubType>Code</SubType>

     </Compile>

-    <Compile Include="types\Triangle.cs">

+    <Compile Include="world\scripting\Scripts\FollowRandomAvatar.cs">

       <SubType>Code</SubType>

     </Compile>

   </ItemGroup>

diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
index b75783e..25bbf07 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
@@ -1,90 +1,91 @@
-<?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="ClientView.Grid.cs" />
-                <include name="ClientView.PacketHandlers.cs" />
-                <include name="ClientView.ProcessPackets.cs" />
-                <include name="ClientView.cs" />
-                <include name="ClientViewBase.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="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="ClientView.cs" />

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

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

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

+                <include name="ClientViewBase.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="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/ParcelManager.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>