13 files changed, 73 insertions, 73 deletions

diff --git a/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build b/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build
index fc2d94b..c3c4ae4 100644
--- a/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build
+++ b/OpenSim/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build
@@ -20,12 +20,12 @@
                     <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/Db4objects.Db4o.dll" />

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

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

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

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

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

             </references>

         </csc>

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

diff --git a/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build b/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build
index daf35c6..860251f 100644
--- a/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build
+++ b/OpenSim/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build
@@ -20,11 +20,11 @@
                     <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/OpenSim.Framework.dll" />

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

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

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

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

             </references>

         </csc>

diff --git a/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build b/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build
index 5845387..00ca3f9 100644
--- a/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build
+++ b/OpenSim/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build
@@ -19,9 +19,9 @@
                     <include name="${project::get-base-directory()}" />

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

                 </lib>

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

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

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

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

             </references>

         </csc>

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

diff --git a/OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build b/OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build
index 726444a..fc3e1e6 100644
--- a/OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build
+++ b/OpenSim/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build
@@ -22,11 +22,11 @@
                     <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/Axiom.MathLib.dll" />

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

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

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

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

             </references>

         </csc>

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

diff --git a/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build b/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build
index a49782f..c93c0c2 100644
--- a/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build
+++ b/OpenSim/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build
@@ -19,10 +19,10 @@
                     <include name="${project::get-base-directory()}" />

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

                 </lib>

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

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

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

                 <include name="../../../bin/Ode.NET.dll" />

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

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

             </references>

         </csc>

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

diff --git a/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build b/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build
index 2ea5534..be7a847 100644
--- a/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build
+++ b/OpenSim/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build
@@ -19,10 +19,10 @@
                     <include name="${project::get-base-directory()}" />

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

                 </lib>

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

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

-                <include name="../../../bin/PhysX_Wrapper_Dotnet.dll" />

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

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

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

             </references>

         </csc>

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

diff --git a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
index 5f33913..13341b3 100644
--- a/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
@@ -11,66 +11,66 @@
             <resources prefix="OpenSim.RegionServer" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

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

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

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

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

                 <include name="AuthenticateSessionsLocal.cs" />

                 <include name="AuthenticateSessionsRemote.cs" />

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

                 <include name="Grid.cs" />

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

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

                 <include name="PacketServer.cs" />

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

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

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

-                <include name="RegionInfoBase.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="Client/ClientView.cs" />

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

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

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

+                <include name="Client/ClientViewBase.cs" />

+                <include name="Estate/EstateManager.cs" />

+                <include name="Scripting/IScriptContext.cs" />

+                <include name="Scripting/IScriptEntity.cs" />

+                <include name="Scripting/IScriptHandler.cs" />

+                <include name="Scripting/Script.cs" />

+                <include name="Scripting/ScriptFactory.cs" />

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

                 <include name="Simulator/Avatar.Client.cs" />

-                <include name="Simulator/Entity.cs" />

-                <include name="Simulator/World.PacketHandlers.cs" />

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

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

                 <include name="Simulator/AvatarAnimations.cs" />

-                <include name="Simulator/WorldBase.cs" />

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

+                <include name="Simulator/ParcelManager.cs" />

                 <include name="Simulator/Primitive.cs" />

-                <include name="Simulator/World.Scripting.cs" />

                 <include name="Simulator/Primitive2.cs" />

                 <include name="Simulator/SceneObject.cs" />

-                <include name="Simulator/Avatar.cs" />

-                <include name="Simulator/Avatar.Update.cs" />

                 <include name="Simulator/World.cs" />

-                <include name="Simulator/ParcelManager.cs" />

-                <include name="Estate/EstateManager.cs" />

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

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

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

-                <include name="Scripting/IScriptHandler.cs" />

-                <include name="Scripting/ScriptFactory.cs" />

-                <include name="Scripting/IScriptContext.cs" />

-                <include name="Scripting/Script.cs" />

-                <include name="Scripting/IScriptEntity.cs" />

-                <include name="Scripting/Scripts/FollowRandomAvatar.cs" />

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

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

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

                 <include name="Types/Mesh.cs" />

                 <include name="Types/Triangle.cs" />

-                <include name="Client/ClientView.Grid.cs" />

-                <include name="Client/ClientView.PacketHandlers.cs" />

-                <include name="Client/ClientViewBase.cs" />

-                <include name="Client/ClientView.ProcessPackets.cs" />

-                <include name="Client/ClientView.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/libsecondlife.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/OpenSim.Terrain.BasicTerrain.dll" />

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

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

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

             </references>

         </csc>

diff --git a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
index ac4d564..cce2fef 100644
--- a/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
+++ b/OpenSim/OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build
@@ -11,26 +11,26 @@
             <resources prefix="OpenSim.Scripting.EmbeddedJVM" dynamicprefix="true" >

             </resources>

             <sources failonempty="true">

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

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

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

                 <include name="Heap.cs" />

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

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

                 <include name="InterpreterLogic.cs" />

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

                 <include name="InterpreterMethods.cs" />

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

                 <include name="InterpreterReturn.cs" />

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

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

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

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

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

                 <include name="Object.cs" />

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

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

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

                 <include name="Thread.cs" />

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

                 <include name="Properties/AssemblyInfo.cs" />

-                <include name="Types/BaseType.cs" />

                 <include name="Types/ArrayReference.cs" />

+                <include name="Types/BaseType.cs" />

                 <include name="Types/ObjectReference.cs" />

-                <include name="Types/PrimitiveTypes/Char.cs" />

                 <include name="Types/PrimitiveTypes/Byte.cs" />

+                <include name="Types/PrimitiveTypes/Char.cs" />

                 <include name="Types/PrimitiveTypes/Float.cs" />

                 <include name="Types/PrimitiveTypes/Int.cs" />

             </sources>

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

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

                 </lib>

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

                 <include name="System.dll" />

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

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

             </references>

         </csc>

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

diff --git a/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build b/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build
index 1c7306a..bc2d8ec 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build
+++ b/OpenSim/OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build
@@ -18,14 +18,14 @@
                     <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="System.Data.dll" />

                 <include name="../../../bin/Kds.Serialization.dll" />

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

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

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

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

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

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

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

             </references>

         </csc>

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

diff --git a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
index 72aac2a..739b98c 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
+++ b/OpenSim/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
@@ -12,22 +12,22 @@
             </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>

                     <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/Db4objects.Db4o.dll" />

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

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

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

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

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

             </references>

         </csc>

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

diff --git a/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build b/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build
index 4c8917a..bd4c731 100644
--- a/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build
+++ b/OpenSim/OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build
@@ -19,13 +19,13 @@
                     <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="System.Data.dll" />

-                <include name="../../../bin/System.Data.SQLite.dll" />

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

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

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

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

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

+                <include name="../../../bin/System.Data.SQLite.dll" />

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

             </references>

         </csc>

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

diff --git a/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build b/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build
index 9c80ac7..6526648 100644
--- a/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build
+++ b/OpenSim/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build
@@ -19,11 +19,11 @@
                     <include name="${project::get-base-directory()}" />

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

                 </lib>

+                <include name="../../bin/libTerrain-BSD.dll" />

                 <include name="System.dll" />

-                <include name="System.Drawing.dll" />

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

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

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

-                <include name="../../bin/libTerrain-BSD.dll" />

             </references>

         </csc>

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

diff --git a/OpenSim/OpenSim/OpenSim.exe.build b/OpenSim/OpenSim/OpenSim.exe.build
index 4f8ca8a..784c9ca 100644
--- a/OpenSim/OpenSim/OpenSim.exe.build
+++ b/OpenSim/OpenSim/OpenSim.exe.build
@@ -19,18 +19,18 @@
                     <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/libsecondlife.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/OpenSim.RegionServer.dll" />

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

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

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

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

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

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

             </references>

         </csc>