Finished initial sim<>Grid login (kinda)

Can login but no config data sent/updated yet

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

OpenGridServices.GridServer/GridHttp.cs

@@ -115,7 +115,6 @@ namespace OpenGridServices.GridServer
 							}
 						}
 
-
 						SimLoginRespData["region_locx"]=TheSim.RegionLocX.ToString();
 						SimLoginRespData["region_locy"]=TheSim.RegionLocY.ToString();
 						SimLoginRespData["regionname"]=TheSim.regionname;

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.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.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.Config.SimConfigDb4o" 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/IGridServer.cs

@@ -48,7 +48,7 @@ namespace OpenSim.Framework.Interfaces
         AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
         bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
         string GetName();
-        bool RequestConnection();
+        bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port);
         void SetServerInfo(string ServerUrl, string SendKey, string RecvKey);
         void Close();
     }

OpenSim.Framework/LocalGridBase.cs

@@ -12,7 +12,7 @@ namespace OpenSim.Framework.Interfaces
         public abstract AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
         public abstract bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
         public abstract string GetName();
-        public abstract bool RequestConnection();
+        public abstract bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port);
         public abstract void SetServerInfo(string ServerUrl, string SendKey, string RecvKey);
         public abstract void AddNewSession(Login session);
         public abstract void Close();

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.Framework/RemoteGridBase.cs

@@ -18,7 +18,7 @@ namespace OpenSim.Framework.Interfaces
         public abstract AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
         public abstract bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
         public abstract string GetName();
-        public abstract bool RequestConnection();
+        public abstract bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port);
         public abstract void SetServerInfo(string ServerUrl, string SendKey, string RecvKey);
         public abstract void Close();
     }

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/LocalGridServer.cs

@@ -63,7 +63,7 @@ namespace OpenSim.GridInterfaces.Local
 			OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Local Grid Server class created");
 		}
 		
-		public override bool RequestConnection()
+		public override bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port)
 		{
 			return 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.GridInterfaces/Remote/RemoteGridServer.cs

@@ -25,12 +25,14 @@
 * 
 */
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Threading;
 using System.Net;
 using System.Net.Sockets;
 using System.IO;
 using libsecondlife;
+using Nwc.XmlRpc;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Assets;
 
@@ -54,8 +56,26 @@ namespace OpenSim.GridInterfaces.Remote
             OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Remote Grid Server class created");
         }
 
-        public override bool RequestConnection()
+        public override bool RequestConnection(LLUUID SimUUID, string sim_ip, uint sim_port)
         {
+	    Hashtable GridParams = new Hashtable();
+            GridParams["authkey"]=GridSendKey;
+	    GridParams["UUID"]=SimUUID.ToString();
+	    GridParams["sim_ip"]=sim_ip;
+	    GridParams["sim_port"]=sim_port.ToString();
+	    ArrayList SendParams = new ArrayList();
+            SendParams.Add(GridParams);
+
+            XmlRpcRequest GridReq = new XmlRpcRequest("simulator_login", SendParams);
+            XmlRpcResponse GridResp = GridReq.Send(this.GridServerUrl, 3000);
+	    Hashtable GridRespData = (Hashtable)GridResp.Value;
+            
+	    if(GridRespData.ContainsKey("error")) {
+	    	string errorstring = (string)GridRespData["error"];
+		OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Error connecting to grid:");
+		OpenSim.Framework.Console.MainConsole.Instance.WriteLine(errorstring);
+	    	return false;
+	    }
 	    return 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">

OpenSim.RegionServer/OpenSimMain.cs

@@ -54,6 +54,7 @@ namespace OpenSim
 
     public class OpenSimMain : OpenSimNetworkHandler, conscmd_callback
     {
+        
 	//private SimConfig Cfg;
         private IGenericConfig localConfig;
         //private IGenericConfig remoteConfig;

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.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,24 +46,24 @@
         <echo message="Deleting all builds from all configurations" />
         <delete dir="${bin.dir}" failonerror="false" />
         <delete dir="${obj.dir}" failonerror="false" />
-        <nant buildfile="OpenSim/OpenSim.exe.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.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="clean" />
-        <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="clean" />
-        <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="clean" />
-        <nant buildfile="OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="clean" />
-        <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="clean" />
-        <nant buildfile="OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="clean" />
-        <nant buildfile="Servers/OpenSim.Servers.dll.build" target="clean" />
-        <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="clean" />
-        <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="clean" />
         <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="clean" />
+        <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="clean" />
+        <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="clean" />
+        <nant buildfile="Servers/OpenSim.Servers.dll.build" target="clean" />
+        <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="clean" />
+        <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="clean" />
         <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="clean" />
+        <nant buildfile="OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="clean" />
+        <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="clean" />
+        <nant buildfile="OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="clean" />
+        <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="clean" />
+        <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="clean" />
+        <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="clean" />
+        <nant buildfile="OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="clean" />
+        <nant buildfile="OpenSim/OpenSim.exe.build" target="clean" />
         <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="clean" />
         <nant buildfile="OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build" target="clean" />
-        <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="clean" />
+        <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="clean" />
-        <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="clean" />
     </target>
 
     <target name="build" depends="init" description="">
@@ -95,24 +95,24 @@
 
     <target name="doc" depends="build-release">
         <echo message="Generating all documentation from all builds" />
-        <nant buildfile="OpenSim/OpenSim.exe.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.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="doc" />
-        <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="doc" />
-        <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="doc" />
-        <nant buildfile="OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="doc" />
-        <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="doc" />
-        <nant buildfile="OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="doc" />
-        <nant buildfile="Servers/OpenSim.Servers.dll.build" target="doc" />
-        <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="doc" />
-        <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="doc" />
         <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="doc" />
+        <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="doc" />
+        <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="doc" />
+        <nant buildfile="Servers/OpenSim.Servers.dll.build" target="doc" />
+        <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="doc" />
+        <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="doc" />
         <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="doc" />
+        <nant buildfile="OpenSim.Config/SimConfigDb4o/OpenSim.Config.SimConfigDb4o.dll.build" target="doc" />
+        <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="doc" />
+        <nant buildfile="OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="doc" />
+        <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="doc" />
+        <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="doc" />
+        <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="doc" />
+        <nant buildfile="OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="doc" />
+        <nant buildfile="OpenSim/OpenSim.exe.build" target="doc" />
         <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="doc" />
         <nant buildfile="OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build" target="doc" />
-        <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="doc" />
+        <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="doc" />
-        <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.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" />

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