Added session IDs to the grid management agent

OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build

@@ -7,7 +7,7 @@
             <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">
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
             <resources prefix="OpenGrid.Config.GridConfigDb4o" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">

OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build

@@ -7,7 +7,7 @@
             <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">
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
             <resources prefix="OpenGrid.Framework.Data.DB4o" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">

OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build

@@ -7,7 +7,7 @@
             <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">
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
             <resources prefix="OpenGrid.Framework.Data.MSSQL" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">

OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build

@@ -7,7 +7,7 @@
             <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">
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
             <resources prefix="OpenGrid.Framework.Data.MySQL" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">

OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build

@@ -7,7 +7,7 @@
             <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">
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
             <resources prefix="OpenGrid.Framework.Data.SQLite" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">

OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build

@@ -7,7 +7,7 @@
             <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">
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
             <resources prefix="OpenGrid.Framework.Data" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">

OpenGrid.Framework.Manager/GridManagementAgent.cs

@@ -3,6 +3,7 @@ using OpenSim.Framework;
 using OpenSim.Servers;
 using System.Collections;
 using System.Collections.Generic;
+using libsecondlife;
 
 namespace OpenGrid.Framework.Manager {
 
@@ -44,6 +45,7 @@ namespace OpenGrid.Framework.Manager {
 			// TODO: Switch this over to using OpenGrid.Framework.Data
 			if( requestData["username"].Equals("admin") && requestData["password"].Equals("supersecret")) {
 				response.IsFault=false;
+				responseData["session_id"]=(LLUUID.Random()).ToString();
 				responseData["msg"]="Login OK";
 			} else {
 				response.IsFault=true;

OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build

@@ -7,7 +7,7 @@
             <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">
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
             <resources prefix="OpenGrid.Framework.Manager" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
@@ -22,6 +22,7 @@
                 <include name="System.dll" />
                 <include name="../bin/OpenSim.Framework.dll" />
                 <include name="../bin/OpenSim.Servers.dll" />
+                <include name="../bin/libsecondlife.dll" />
                 <include name="../bin/XMLRPC.dll" />
             </references>
         </csc>

OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build

@@ -7,7 +7,7 @@
             <fileset basedir="${project::get-base-directory()}">
             </fileset>
         </copy>
-        <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe">
+        <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe">
             <resources prefix="OpenGridServices.AssetServer" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">

OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build

@@ -7,7 +7,7 @@
             <fileset basedir="${project::get-base-directory()}">
             </fileset>
         </copy>
-        <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe">
+        <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe">
             <resources prefix="OpenGridServices.GridServer" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">

OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build

@@ -7,7 +7,7 @@
             <fileset basedir="${project::get-base-directory()}">
             </fileset>
         </copy>
-        <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe">
+        <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe">
             <resources prefix="OpenGridServices.UserServer" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">

OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build

@@ -7,7 +7,7 @@
             <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">
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
             <resources prefix="OpenSim.Framework.Console" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">

OpenSim.Framework/OpenSim.Framework.dll.build

@@ -7,7 +7,7 @@
             <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">
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
             <resources prefix="OpenSim.Framework" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">

OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build

@@ -7,7 +7,7 @@
             <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">
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
             <resources prefix="OpenSim.GenericConfig.Xml" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">

OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build

@@ -7,7 +7,7 @@
             <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">
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
             <resources prefix="OpenSim.GridInterfaces.Local" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">

OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build

@@ -7,7 +7,7 @@
             <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">
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
             <resources prefix="OpenSim.GridInterfaces.Remote" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">

OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build

@@ -7,7 +7,7 @@
             <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">
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
             <resources prefix="OpenSim.Physics.BasicPhysicsPlugin" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">

OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build

@@ -7,7 +7,7 @@
             <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">
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
             <resources prefix="OpenSim.Physics.Manager" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">

OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build

@@ -7,7 +7,7 @@
             <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">
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
             <resources prefix="OpenSim.Physics.OdePlugin" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">

OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build

@@ -7,7 +7,7 @@
             <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">
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
             <resources prefix="OpenSim.Physics.PhysXPlugin" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">

OpenSim.RegionServer/OpenSim.RegionServer.dll.build

@@ -7,7 +7,7 @@
             <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">
+        <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">
@@ -22,10 +22,10 @@
                 <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="SimClient.cs" />
                 <include name="SimClientBase.cs" />
                 <include name="UDPServer.cs" />
                 <include name="VersionInfo.cs" />
@@ -35,16 +35,16 @@
                 <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/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.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" />

OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build

@@ -7,7 +7,7 @@
             <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">
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
             <resources prefix="OpenSim.Scripting.EmbeddedJVM" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">

OpenSim.Servers/OpenSim.Servers.dll.build

@@ -7,7 +7,7 @@
             <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">
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
             <resources prefix="OpenSim.Servers" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">

OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build

@@ -7,7 +7,7 @@
             <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">
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
             <resources prefix="OpenSim.Storage.LocalStorageBerkeleyDB" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">

OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build

@@ -7,7 +7,7 @@
             <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">
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
             <resources prefix="OpenSim.Storage.LocalStorageDb4o" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">

OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build

@@ -7,7 +7,7 @@
             <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">
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
             <resources prefix="OpenSim.Storage.LocalStorageSQLite" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">

OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build

@@ -7,7 +7,7 @@
             <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">
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
             <resources prefix="OpenSim.Terrain.BasicTerrain" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">

OpenSim.build

@@ -6,12 +6,6 @@
     <property name="obj.dir" value="obj" />
     <property name="doc.dir" value="doc" />
     <property name="project.main.dir" value="${project::get-base-directory()}" />
-
-    <target name="Debug" description="">
-        <property name="project.config" value="Debug" />
-        <property name="build.debug" value="true" />
-    </target>
-
     <property name="project.config" value="Release" />
 
     <target name="Release" description="">
@@ -19,6 +13,12 @@
         <property name="build.debug" value="false" />
     </target>
 
+
+    <target name="Debug" description="">
+        <property name="project.config" value="Debug" />
+        <property name="build.debug" value="true" />
+    </target>
+
     <target name="net-1.1" description="Sets framework to .NET 1.1">
         <property name="nant.settings.currentframework" value="net-1.1" />
     </target>
@@ -46,36 +46,36 @@
         <echo message="Deleting all builds from all configurations" />
         <delete dir="${bin.dir}" failonerror="false" />
         <delete dir="${obj.dir}" failonerror="false" />
-        <nant buildfile="OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="clean" />
-        <nant buildfile="OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build" target="clean" />
-        <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="clean" />
-        <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="clean" />
-        <nant buildfile="OpenSim/OpenSim.exe.build" target="clean" />
         <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="clean" />
-        <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="clean" />
+        <nant buildfile="OpenSim/OpenSim.exe.build" target="clean" />
-        <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="clean" />
-        <nant buildfile="OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build" target="clean" />
-        <nant buildfile="OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build" target="clean" />
-        <nant buildfile="OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="clean" />
-        <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="clean" />
-        <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="clean" />
-        <nant buildfile="OpenSim.Servers/OpenSim.Servers.dll.build" target="clean" />
         <nant buildfile="OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="clean" />
-        <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="clean" />
-        <nant buildfile="OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build" target="clean" />
         <nant buildfile="OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build" target="clean" />
-        <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="clean" />
+        <nant buildfile="OpenSim.Servers/OpenSim.Servers.dll.build" target="clean" />
-        <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="clean" />
-        <nant buildfile="OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build" target="clean" />
-        <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="clean" />
-        <nant buildfile="OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="clean" />
-        <nant buildfile="OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build" target="clean" />
-        <nant buildfile="OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build" target="clean" />
-        <nant buildfile="ServiceManager/ServiceManager.exe.build" target="clean" />
         <nant buildfile="OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build" target="clean" />
-        <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="clean" />
         <nant buildfile="OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build" target="clean" />
+        <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="clean" />
+        <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="clean" />
+        <nant buildfile="OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build" target="clean" />
+        <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="clean" />
+        <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="clean" />
+        <nant buildfile="OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build" target="clean" />
+        <nant buildfile="OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build" target="clean" />
+        <nant buildfile="OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build" target="clean" />
+        <nant buildfile="ServiceManager/ServiceManager.exe.build" target="clean" />
+        <nant buildfile="OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="clean" />
+        <nant buildfile="OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build" target="clean" />
+        <nant buildfile="OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build" target="clean" />
+        <nant buildfile="OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="clean" />
+        <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="clean" />
+        <nant buildfile="OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="clean" />
+        <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="clean" />
+        <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="clean" />
+        <nant buildfile="OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build" target="clean" />
+        <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="clean" />
+        <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="clean" />
         <nant buildfile="XmlRpcCS/XMLRPC.dll.build" target="clean" />
+        <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="clean" />
+        <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="clean" />
     </target>
 
     <target name="build" depends="init" description="">
@@ -119,36 +119,36 @@
 
     <target name="doc" depends="build-release">
         <echo message="Generating all documentation from all builds" />
-        <nant buildfile="OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="doc" />
-        <nant buildfile="OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build" target="doc" />
-        <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="doc" />
-        <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="doc" />
-        <nant buildfile="OpenSim/OpenSim.exe.build" target="doc" />
         <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="doc" />
-        <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="doc" />
+        <nant buildfile="OpenSim/OpenSim.exe.build" target="doc" />
-        <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="doc" />
-        <nant buildfile="OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build" target="doc" />
-        <nant buildfile="OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build" target="doc" />
-        <nant buildfile="OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="doc" />
-        <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="doc" />
-        <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="doc" />
-        <nant buildfile="OpenSim.Servers/OpenSim.Servers.dll.build" target="doc" />
         <nant buildfile="OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="doc" />
-        <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="doc" />
-        <nant buildfile="OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build" target="doc" />
         <nant buildfile="OpenGrid.Framework.Manager/OpenGrid.Framework.Manager.dll.build" target="doc" />
-        <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="doc" />
+        <nant buildfile="OpenSim.Servers/OpenSim.Servers.dll.build" target="doc" />
-        <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="doc" />
-        <nant buildfile="OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build" target="doc" />
-        <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="doc" />
-        <nant buildfile="OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="doc" />
-        <nant buildfile="OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build" target="doc" />
-        <nant buildfile="OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build" target="doc" />
-        <nant buildfile="ServiceManager/ServiceManager.exe.build" target="doc" />
         <nant buildfile="OpenGrid.Framework.Data.SQLite/OpenGrid.Framework.Data.SQLite.dll.build" target="doc" />
-        <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="doc" />
         <nant buildfile="OpenGridServices.AssetServer/OpenGridServices.AssetServer.exe.build" target="doc" />
+        <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="doc" />
+        <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="doc" />
+        <nant buildfile="OpenSim.Storage/LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build" target="doc" />
+        <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="doc" />
+        <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="doc" />
+        <nant buildfile="OpenGrid.Framework.Data.MySQL/OpenGrid.Framework.Data.MySQL.dll.build" target="doc" />
+        <nant buildfile="OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build" target="doc" />
+        <nant buildfile="OpenGrid.Framework.Data/OpenGrid.Framework.Data.dll.build" target="doc" />
+        <nant buildfile="ServiceManager/ServiceManager.exe.build" target="doc" />
+        <nant buildfile="OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="doc" />
+        <nant buildfile="OpenGrid.Framework.Data.MSSQL/OpenGrid.Framework.Data.MSSQL.dll.build" target="doc" />
+        <nant buildfile="OpenSim.Scripting/EmbeddedJVM/OpenSim.Scripting.EmbeddedJVM.dll.build" target="doc" />
+        <nant buildfile="OpenSim.Storage/LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="doc" />
+        <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="doc" />
+        <nant buildfile="OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="doc" />
+        <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="doc" />
+        <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="doc" />
+        <nant buildfile="OpenGrid.Framework.Data.DB4o/OpenGrid.Framework.Data.DB4o.dll.build" target="doc" />
+        <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="doc" />
+        <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="doc" />
         <nant buildfile="XmlRpcCS/XMLRPC.dll.build" target="doc" />
+        <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="doc" />
+        <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="doc" />
     </target>
 
 </project>

OpenSim/OpenSim.exe.build

@@ -7,7 +7,7 @@
             <fileset basedir="${project::get-base-directory()}">
             </fileset>
         </copy>
-        <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe">
+        <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe">
             <resources prefix="OpenSim" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">

OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build

@@ -7,7 +7,7 @@
             <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">
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
             <resources prefix="OpenUser.Config.UserConfigDb4o" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">

Prebuild/Prebuild.build

@@ -6,12 +6,6 @@
     <property name="obj.dir" value="obj" />
     <property name="doc.dir" value="doc" />
     <property name="project.main.dir" value="${project::get-base-directory()}" />
-
-    <target name="Debug" description="">
-        <property name="project.config" value="Debug" />
-        <property name="build.debug" value="true" />
-    </target>
-
     <property name="project.config" value="Release" />
 
     <target name="Release" description="">
@@ -19,6 +13,12 @@
         <property name="build.debug" value="false" />
     </target>
 
+
+    <target name="Debug" description="">
+        <property name="project.config" value="Debug" />
+        <property name="build.debug" value="true" />
+    </target>
+
     <target name="net-1.1" description="Sets framework to .NET 1.1">
         <property name="nant.settings.currentframework" value="net-1.1" />
     </target>

Prebuild/src/Prebuild.exe.build

@@ -7,7 +7,7 @@
             <fileset basedir="${project::get-base-directory()}">
             </fileset>
         </copy>
-        <csc target="exe" debug="${build.debug}" keyfile="Prebuild.snk" unsafe="False" define="DEBUG;TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe" win32icon="App.ico">
+        <csc target="exe" debug="${build.debug}" keyfile="Prebuild.snk" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe" win32icon="App.ico">
             <resources prefix="Prebuild" dynamicprefix="true" >
                 <include name="App.ico" />
                 <include name="data/prebuild-1.7.xsd" />

ServiceManager/ServiceManager.exe.build

@@ -7,7 +7,7 @@
             <fileset basedir="${project::get-base-directory()}">
             </fileset>
         </copy>
-        <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe">
+        <csc target="exe" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.exe">
             <resources prefix="ServiceManager" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">

XmlRpcCS/XMLRPC.dll.build

@@ -7,7 +7,7 @@
             <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">
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
             <resources prefix="XMLRPC" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">

prebuild.xml

@@ -385,6 +385,7 @@
      <Reference name="System" localCopy="false"/>
      <Reference name="OpenSim.Framework"/>
      <Reference name="OpenSim.Servers"/>
+     <Reference name="libsecondlife.dll"/>
      <Reference name="XMLRPC"/>