31 files changed, 1443 insertions, 1351 deletions
diff --git a/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build b/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build
index 61d3efd..73e09ce 100644
--- a/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build
+++ b/OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build
@@ -1,46 +1,46 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" ?>
-<project name="OpenGrid.Config.GridConfigDb4o" default="build">
+<project name="OpenGrid.Config.GridConfigDb4o" default="build">
-    <target name="build">
+    <target name="build">
-        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
-        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
-        <copy todir="${project::get-base-directory()}/${build.dir}">
+        <copy todir="${project::get-base-directory()}/${build.dir}">
-            <fileset basedir="${project::get-base-directory()}">
+            <fileset basedir="${project::get-base-directory()}">
-            </fileset>
+            </fileset>
-        </copy>
+        </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 prefix="OpenGrid.Config.GridConfigDb4o" dynamicprefix="true" >
-            </resources>
+            </resources>
-            <sources failonempty="true">
+            <sources failonempty="true">
-                <include name="AssemblyInfo.cs" />
+                <include name="AssemblyInfo.cs" />
-                <include name="DbGridConfig.cs" />
+                <include name="DbGridConfig.cs" />
-            </sources>
+            </sources>
-            <references basedir="${project::get-base-directory()}">
+            <references basedir="${project::get-base-directory()}">
-                <lib>
+                <lib>
-                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}" />
-                    <include name="${project::get-base-directory()}/${build.dir}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
-                </lib>
+                </lib>
-                <include name="System.dll" />
+                <include name="System.dll" />
-                <include name="System.Data.dll.dll" />
+                <include name="System.Data.dll.dll" />
-                <include name="System.Xml.dll" />
+                <include name="System.Xml.dll" />
-                <include name="../../bin/libsecondlife.dll" />
+                <include name="../../bin/libsecondlife.dll" />
-                <include name="../../bin/Db4objects.Db4o.dll" />
+                <include name="../../bin/Db4objects.Db4o.dll" />
-                <include name="../../bin/OpenSim.Framework.dll" />
+                <include name="../../bin/OpenSim.Framework.dll" />
-                <include name="../../bin/OpenSim.Framework.Console.dll" />
+                <include name="../../bin/OpenSim.Framework.Console.dll" />
-            </references>
+            </references>
-        </csc>
+        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../../bin/"/>
+        <mkdir dir="${project::get-base-directory()}/../../bin/"/>
-        <copy todir="${project::get-base-directory()}/../../bin/">
+        <copy todir="${project::get-base-directory()}/../../bin/">
-            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
-                <include name="*.dll"/>
+                <include name="*.dll"/>
-                <include name="*.exe"/>
+                <include name="*.exe"/>
-            </fileset>
+            </fileset>
-        </copy>
+        </copy>
-    </target>
+    </target>
-    <target name="clean">
+    <target name="clean">
-        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${bin.dir}" failonerror="false" />
-        <delete dir="${obj.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
-    </target>
+    </target>
-    <target name="doc" description="Creates documentation.">
+    <target name="doc" description="Creates documentation.">
-    </target>
+    </target>
-</project>
+</project>
diff --git a/OpenGridServices.GridServer/GridHttp.cs b/OpenGridServices.GridServer/GridHttp.cs
index 4bc9ef0..ed56b63 100644
--- a/OpenGridServices.GridServer/GridHttp.cs
+++ b/OpenGridServices.GridServer/GridHttp.cs
@@ -57,6 +57,7 @@ namespace OpenGridServices.GridServer
                        MainConsole.Instance.WriteLine("GridHttp.cs:StartHTTP() - Spawned main thread OK");
                        Listener = new HttpListener();
+                        Listener.Prefixes.Add("http://+:8001/");                        
                        Listener.Prefixes.Add("http://+:8001/sims/");
                        Listener.Prefixes.Add("http://+:8001/gods/");
                        Listener.Prefixes.Add("http://+:8001/highestuuid/");
@@ -79,23 +80,30 @@ namespace OpenGridServices.GridServer
                                Hashtable requestData = (Hashtable)request.Params[0];
                                switch(request.MethodName) {
                                        case "simulator_login":
-                                                if(!(referrer=="simulator")) {
+                                        
+                                                /*if(!((string)requestData["authkey"]==OpenGrid_Main.thegrid.SimRecvKey)) {
                                                        XmlRpcResponse ErrorResp = new XmlRpcResponse();
                                                        Hashtable ErrorRespData = new Hashtable();
-                                                        ErrorRespData["error"]="Only simulators can login with this method";
+                                                        ErrorRespData["error"]="invalid key";
                                                        ErrorResp.Value=ErrorRespData;
                                                        return(Regex.Replace(XmlRpcResponseSerializer.Singleton.Serialize(ErrorResp),"utf-16","utf-8"));
-                                                }
+                                                }*/
-                                                
+                                                SimProfileBase TheSim = null;
-                                                if(!((string)requestData["authkey"]==OpenGrid_Main.thegrid.SimRecvKey)) {
+                                                if(requestData.ContainsKey("UUID")) {                                           
+                                                        TheSim = OpenGrid_Main.thegrid._regionmanager.GetProfileByLLUUID(new LLUUID((string)requestData["UUID"]));
+                                                } else if (requestData.ContainsKey("region_handle")){
+                                                        TheSim = OpenGrid_Main.thegrid._regionmanager.GetProfileByHandle((ulong)Convert.ToUInt64(requestData["region_handle"]));
+                                                }
+                                                
+                                                if(TheSim==null) {
                                                        XmlRpcResponse ErrorResp = new XmlRpcResponse();
                                                        Hashtable ErrorRespData = new Hashtable();
-                                                        ErrorRespData["error"]="invalid key";
+                                                        ErrorRespData["error"]="sim not found";
                                                        ErrorResp.Value=ErrorRespData;
-                                                        return(Regex.Replace(XmlRpcResponseSerializer.Singleton.Serialize(ErrorResp),"utf-16","utf-8"));
+                                                        return(Regex.Replace(XmlRpcResponseSerializer.Singleton.Serialize(ErrorResp),"utf-16","utf-8"));
-                                                }
+                                                }
-                                                SimProfileBase TheSim = OpenGrid_Main.thegrid._regionmanager.GetProfileByLLUUID(new LLUUID((string)requestData["UUID"]));
                                                XmlRpcResponse SimLoginResp = new XmlRpcResponse();
                                                Hashtable SimLoginRespData = new Hashtable();
                                                
@@ -115,7 +123,8 @@ namespace OpenGridServices.GridServer
                                                                SimNeighboursData.Add(NeighbourBlock);
                                                        }
                                                }
+                                                SimLoginRespData["UUID"]=TheSim.UUID;   
                                                SimLoginRespData["region_locx"]=TheSim.RegionLocX.ToString();
                                                SimLoginRespData["region_locy"]=TheSim.RegionLocY.ToString();
                                                SimLoginRespData["regionname"]=TheSim.regionname;
@@ -138,15 +147,24 @@ namespace OpenGridServices.GridServer
                        return "";
                }
                
-                static string ParseREST(string requestBody, string requestURL, string HTTPmethod) {
+                static string ParseREST(string requestURL, string requestBody, string HTTPmethod) {
                        char[] splitter  = {'/'};
                        string[] rest_params = requestURL.Split(splitter);
                        string req_type = rest_params[0];       // First part of the URL is the type of request - 
-                        string respstring;
+                        string respstring="";
+                        SimProfileBase TheSim;
+                        Console.WriteLine(req_type);
                        switch(req_type) {
-                                case "sims":
+                                case "regions":
+                                        // DIRTY HACK ALERT
+                                        Console.WriteLine("/regions/ accessed");                                        
+                                        TheSim=OpenGrid_Main.thegrid._regionmanager.GetProfileByHandle((ulong)Convert.ToUInt64(rest_params[1]));
+                                        respstring=ParseREST("/regions/" + rest_params[1], requestBody, HTTPmethod);
+                                break;
+                                
+                                case "sims":
                                        LLUUID UUID = new LLUUID((string)rest_params[1]);
-                                        SimProfileBase TheSim = OpenGrid_Main.thegrid._regionmanager.GetProfileByLLUUID(UUID);
+                                        TheSim = OpenGrid_Main.thegrid._regionmanager.GetProfileByLLUUID(UUID);
                                        if(!(TheSim==null)) {
                                                switch(HTTPmethod) {
                                                        case "GET":
@@ -162,18 +180,67 @@ namespace OpenGridServices.GridServer
                                                                respstring+="</sim>";
                                                        break;
                                                        case "POST":
+                                                                Console.WriteLine("Updating sim details.....");                                                         
                                                                XmlDocument doc = new XmlDocument();
                                                                doc.LoadXml(requestBody);
                                                                XmlNode authkeynode = doc.FirstChild;
-                                                                if (authkeynode.Name != "authkey")
+                                                                if (authkeynode.Name != "authkey") {
-                                                                        respstring = "<error>bad XML - expected authkey tag</error>";
+                                                                        respstring = "ERROR! bad XML - expected authkey tag";
+                                                                        return respstring;      
+                                                                }
                                                                XmlNode simnode = doc.ChildNodes[1];
-                                                                if (simnode.Name != "sim")
+                                                                if (simnode.Name != "sim") {
-                                                                        respstring = "<error>bad XML - expected sim tag</error>";
+                                                                        respstring = "ERROR! bad XML - expected sim tag";
+                                                                        return respstring;
+                                                                }
+                                                                if (authkeynode.Name != OpenGrid_Main.thegrid.SimRecvKey) {
+                                                                        respstring = "ERROR! invalid key";
+                                                                        return respstring;
+                                                                }
+                                                                if (TheSim==null) {
+                                                                        respstring="ERROR! sim not found";
+                                                                        return respstring;
+                                                                } else {
+                                                                        for(int i=0; i<= simnode.ChildNodes.Count; i++) {
+                                                                                switch(simnode.ChildNodes[i].Name) {
+                                                                                        case "uuid":
+                                                                                                // should a sim be able to update it's own UUID? To be decided
+                                                                                                // watch next week for the exciting conclusion in "the adventures of OpenGridServices.GridServer/GridHttp.cs:ParseREST() at line 190!
+                                                                                        break;                  // and line 190's arch-enemy - THE BREAK STATEMENT! OH NOES!!!!! (this code written at 6:57AM, no sleep, lots of caffeine)
+                                                                                        
+                                                                                        case "regionname":
+                                                                                                TheSim.regionname=simnode.ChildNodes[i].InnerText;
+                                                                                        break;
+                                                                                        case "sim_ip":
+                                                                                                TheSim.sim_ip=simnode.ChildNodes[i].InnerText;
+                                                                                        break;
+                                                                                        
+                                                                                        case "sim_port":
+                                                                                                TheSim.sim_port=Convert.ToUInt32(simnode.ChildNodes[i].InnerText);
+                                                                                        break;
+                                                                                        case "region_locx":
+                                                                                                TheSim.RegionLocX=Convert.ToUInt32((string)simnode.ChildNodes[i].InnerText);
+                                                                                                TheSim.regionhandle=Helpers.UIntsToLong((TheSim.RegionLocX * 256), (TheSim.RegionLocY * 256));
+                                                                                        break;
+                                                                                        
+                                                                                        case "region_locy":
+                                                                                                TheSim.RegionLocY=Convert.ToUInt32((string)simnode.ChildNodes[i].InnerText);
+                                                                                                TheSim.regionhandle=Helpers.UIntsToLong((TheSim.RegionLocX * 256), (TheSim.RegionLocY * 256));
+                                                                                        break;
+                                                                                }
+                                                                        }
+                                                                        respstring="OK";                                                                                                                                        
+                                                                }
+                                                                
+                                                                
                                                        break;
                                                }
                                        }
+                                        return respstring;
                                break;
                        }
                        return "";
@@ -209,9 +276,14 @@ namespace OpenGridServices.GridServer
                                        response.AddHeader("Content-type","text/xml");  
                                break;
                                
+                                case "text/plaintext":
+                                        // must be REST
+                                        responseString=ParseREST(request.RawUrl,requestBody,request.HttpMethod);
+                                break;
                                case null:
                                        // must be REST or invalid crap, so pass to the REST parser
-                                        responseString=ParseREST(request.Url.OriginalString,requestBody,request.HttpMethod);
+                                        responseString=ParseREST(request.RawUrl,requestBody,request.HttpMethod);
                                break;
                        }
        
diff --git a/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build b/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build
index 90eaf1f..111e2f7 100644
--- a/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build
+++ b/OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build
@@ -1,48 +1,48 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" ?>
-<project name="OpenGridServices.GridServer" default="build">
+<project name="OpenGridServices.GridServer" default="build">
-    <target name="build">
+    <target name="build">
-        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
-        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
-        <copy todir="${project::get-base-directory()}/${build.dir}">
+        <copy todir="${project::get-base-directory()}/${build.dir}">
-            <fileset basedir="${project::get-base-directory()}">
+            <fileset basedir="${project::get-base-directory()}">
-            </fileset>
+            </fileset>
-        </copy>
+        </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 prefix="OpenGridServices.GridServer" dynamicprefix="true" >
-            </resources>
+            </resources>
-            <sources failonempty="true">
+            <sources failonempty="true">
-                <include name="GridHttp.cs" />
+                <include name="GridHttp.cs" />
-                <include name="Main.cs" />
+                <include name="Main.cs" />
-                <include name="SimProfiles.cs" />
+                <include name="SimProfiles.cs" />
-                <include name="Properties/AssemblyInfo.cs" />
+                <include name="Properties/AssemblyInfo.cs" />
-            </sources>
+            </sources>
-            <references basedir="${project::get-base-directory()}">
+            <references basedir="${project::get-base-directory()}">
-                <lib>
+                <lib>
-                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}" />
-                    <include name="${project::get-base-directory()}/${build.dir}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
-                </lib>
+                </lib>
-                <include name="System.dll" />
+                <include name="System.dll" />
-                <include name="System.Data.dll" />
+                <include name="System.Data.dll" />
-                <include name="System.Xml.dll" />
+                <include name="System.Xml.dll" />
-                <include name="../bin/OpenSim.Framework.dll" />
+                <include name="../bin/OpenSim.Framework.dll" />
-                <include name="../bin/OpenSim.Framework.Console.dll" />
+                <include name="../bin/OpenSim.Framework.Console.dll" />
-                <include name="../bin/libsecondlife.dll" />
+                <include name="../bin/libsecondlife.dll" />
-                <include name="../bin/Db4objects.Db4o.dll" />
+                <include name="../bin/Db4objects.Db4o.dll" />
-            </references>
+            </references>
-        </csc>
+        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../bin/"/>
+        <mkdir dir="${project::get-base-directory()}/../bin/"/>
-        <copy todir="${project::get-base-directory()}/../bin/">
+        <copy todir="${project::get-base-directory()}/../bin/">
-            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
-                <include name="*.dll"/>
+                <include name="*.dll"/>
-                <include name="*.exe"/>
+                <include name="*.exe"/>
-            </fileset>
+            </fileset>
-        </copy>
+        </copy>
-    </target>
+    </target>
-    <target name="clean">
+    <target name="clean">
-        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${bin.dir}" failonerror="false" />
-        <delete dir="${obj.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
-    </target>
+    </target>
-    <target name="doc" description="Creates documentation.">
+    <target name="doc" description="Creates documentation.">
-    </target>
+    </target>
-</project>
+</project>
diff --git a/OpenGridServices.UserServer/Main.cs b/OpenGridServices.UserServer/Main.cs
index 999d446..9c128d3 100644
--- a/OpenGridServices.UserServer/Main.cs
+++ b/OpenGridServices.UserServer/Main.cs
@@ -99,6 +99,39 @@ namespace OpenGridServices.UserServer
                        _httpd = new UserHTTPServer();
                }
+        public void do_create(string what)
+        {
+                switch(what)
+                {
+                        case "user":
+                            m_console.WriteLine("Creating new user profile");
+                            string tempfirstname;
+                            string templastname;
+                            string tempMD5Passwd;
+        
+                            tempfirstname=m_console.CmdPrompt("First name: ");
+                            templastname=m_console.CmdPrompt("Last name: ");
+                            tempMD5Passwd=m_console.PasswdPrompt("Password: ");
+                        
+                            System.Security.Cryptography.MD5CryptoServiceProvider x = new System.Security.Cryptography.MD5CryptoServiceProvider();
+                            byte[] bs = System.Text.Encoding.UTF8.GetBytes(tempMD5Passwd);
+                            bs = x.ComputeHash(bs);
+                            System.Text.StringBuilder s = new System.Text.StringBuilder();
+                            foreach (byte b in bs)
+                            {
+                                s.Append(b.ToString("x2").ToLower());
+                            }
+                            tempMD5Passwd = s.ToString();
+        
+                            UserProfile newuser=_profilemanager.CreateNewProfile(tempfirstname,templastname,tempMD5Passwd);
+                            newuser.homelookat = new LLVector3(-0.57343f, -0.819255f, 0f);
+                            newuser.homepos = new LLVector3(128f,128f,23f);
+                            _profilemanager.SaveUserProfiles();
+                    break;
+                }
+        }
        public void RunCmd(string cmd, string[] cmdparams)
        {
            switch (cmd)
@@ -108,31 +141,9 @@ namespace OpenGridServices.UserServer
                    m_console.WriteLine("shutdown - shutdown the grid (USE CAUTION!)");
                    break;
-                case "create user":
+                case "create":
-                    m_console.WriteLine("Creating new user profile");
+                        do_create(cmdparams[0]);
-                    string tempfirstname;
+                break;
-                    string templastname;
-                    string tempMD5Passwd;
-                    tempfirstname=m_console.CmdPrompt("First name: ");
-                    templastname=m_console.CmdPrompt("Last name: ");
-                    tempMD5Passwd=m_console.PasswdPrompt("Password: ");
-                
-                    System.Security.Cryptography.MD5CryptoServiceProvider x = new System.Security.Cryptography.MD5CryptoServiceProvider();
-                    byte[] bs = System.Text.Encoding.UTF8.GetBytes(tempMD5Passwd);
-                    bs = x.ComputeHash(bs);
-                    System.Text.StringBuilder s = new System.Text.StringBuilder();
-                    foreach (byte b in bs)
-                    {
-                        s.Append(b.ToString("x2").ToLower());
-                    }
-                    tempMD5Passwd = "$1$" + s.ToString();
-                    UserProfile newuser=_profilemanager.CreateNewProfile(tempfirstname,templastname,tempMD5Passwd);
-                    newuser.homelookat = new LLVector3(-0.57343f, -0.819255f, 0f);
-                    newuser.homepos = new LLVector3(128f,128f,23f);
-                    _profilemanager.SaveUserProfiles();
-                    break;
                case "shutdown":
                    m_console.Close();
diff --git a/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build b/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
index 7212a7b..fd1be15 100644
--- a/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
+++ b/OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build
@@ -1,47 +1,47 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" ?>
-<project name="OpenGridServices.UserServer" default="build">
+<project name="OpenGridServices.UserServer" default="build">
-    <target name="build">
+    <target name="build">
-        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
-        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
-        <copy todir="${project::get-base-directory()}/${build.dir}">
+        <copy todir="${project::get-base-directory()}/${build.dir}">
-            <fileset basedir="${project::get-base-directory()}">
+            <fileset basedir="${project::get-base-directory()}">
-            </fileset>
+            </fileset>
-        </copy>
+        </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 prefix="OpenGridServices.UserServer" dynamicprefix="true" >
-            </resources>
+            </resources>
-            <sources failonempty="true">
+            <sources failonempty="true">
-                <include name="Main.cs" />
+                <include name="Main.cs" />
-                <include name="UserHttp.cs" />
+                <include name="UserHttp.cs" />
-                <include name="Properties/AssemblyInfo.cs" />
+                <include name="Properties/AssemblyInfo.cs" />
-            </sources>
+            </sources>
-            <references basedir="${project::get-base-directory()}">
+            <references basedir="${project::get-base-directory()}">
-                <lib>
+                <lib>
-                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}" />
-                    <include name="${project::get-base-directory()}/${build.dir}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
-                </lib>
+                </lib>
-                <include name="System.dll" />
+                <include name="System.dll" />
-                <include name="System.Data.dll" />
+                <include name="System.Data.dll" />
-                <include name="System.Xml.dll" />
+                <include name="System.Xml.dll" />
-                <include name="../bin/OpenSim.Framework.dll" />
+                <include name="../bin/OpenSim.Framework.dll" />
-                <include name="../bin/OpenSim.Framework.Console.dll" />
+                <include name="../bin/OpenSim.Framework.Console.dll" />
-                <include name="../bin/libsecondlife.dll" />
+                <include name="../bin/libsecondlife.dll" />
-                <include name="../bin/Db4objects.Db4o.dll" />
+                <include name="../bin/Db4objects.Db4o.dll" />
-            </references>
+            </references>
-        </csc>
+        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../bin/"/>
+        <mkdir dir="${project::get-base-directory()}/../bin/"/>
-        <copy todir="${project::get-base-directory()}/../bin/">
+        <copy todir="${project::get-base-directory()}/../bin/">
-            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
-                <include name="*.dll"/>
+                <include name="*.dll"/>
-                <include name="*.exe"/>
+                <include name="*.exe"/>
-            </fileset>
+            </fileset>
-        </copy>
+        </copy>
-    </target>
+    </target>
-    <target name="clean">
+    <target name="clean">
-        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${bin.dir}" failonerror="false" />
-        <delete dir="${obj.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
-    </target>
+    </target>
-    <target name="doc" description="Creates documentation.">
+    <target name="doc" description="Creates documentation.">
-    </target>
+    </target>
-</project>
+</project>
diff --git a/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build b/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build
index fa90bb6..a3019ee 100644
--- a/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build
+++ b/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build
@@ -1,42 +1,42 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" ?>
-<project name="OpenSim.Framework.Console" default="build">
+<project name="OpenSim.Framework.Console" default="build">
-    <target name="build">
+    <target name="build">
-        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
-        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
-        <copy todir="${project::get-base-directory()}/${build.dir}">
+        <copy todir="${project::get-base-directory()}/${build.dir}">
-            <fileset basedir="${project::get-base-directory()}">
+            <fileset basedir="${project::get-base-directory()}">
-            </fileset>
+            </fileset>
-        </copy>
+        </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 prefix="OpenSim.Framework.Console" dynamicprefix="true" >
-            </resources>
+            </resources>
-            <sources failonempty="true">
+            <sources failonempty="true">
-                <include name="AssemblyInfo.cs" />
+                <include name="AssemblyInfo.cs" />
-                <include name="ConsoleBase.cs" />
+                <include name="ConsoleBase.cs" />
-                <include name="ConsoleCallbacksBase.cs" />
+                <include name="ConsoleCallbacksBase.cs" />
-                <include name="MainConsole.cs" />
+                <include name="MainConsole.cs" />
-            </sources>
+            </sources>
-            <references basedir="${project::get-base-directory()}">
+            <references basedir="${project::get-base-directory()}">
-                <lib>
+                <lib>
-                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}" />
-                    <include name="${project::get-base-directory()}/${build.dir}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
-                </lib>
+                </lib>
-                <include name="System.dll" />
+                <include name="System.dll" />
-            </references>
+            </references>
-        </csc>
+        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../bin/"/>
+        <mkdir dir="${project::get-base-directory()}/../bin/"/>
-        <copy todir="${project::get-base-directory()}/../bin/">
+        <copy todir="${project::get-base-directory()}/../bin/">
-            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
-                <include name="*.dll"/>
+                <include name="*.dll"/>
-                <include name="*.exe"/>
+                <include name="*.exe"/>
-            </fileset>
+            </fileset>
-        </copy>
+        </copy>
-    </target>
+    </target>
-    <target name="clean">
+    <target name="clean">
-        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${bin.dir}" failonerror="false" />
-        <delete dir="${obj.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
-    </target>
+    </target>
-    <target name="doc" description="Creates documentation.">
+    <target name="doc" description="Creates documentation.">
-    </target>
+    </target>
-</project>
+</project>
diff --git a/OpenSim.Framework/OpenSim.Framework.dll.build b/OpenSim.Framework/OpenSim.Framework.dll.build
index 89010d2..b351625 100644
--- a/OpenSim.Framework/OpenSim.Framework.dll.build
+++ b/OpenSim.Framework/OpenSim.Framework.dll.build
@@ -1,67 +1,67 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" ?>
-<project name="OpenSim.Framework" default="build">
+<project name="OpenSim.Framework" default="build">
-    <target name="build">
+    <target name="build">
-        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
-        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
-        <copy todir="${project::get-base-directory()}/${build.dir}">
+        <copy todir="${project::get-base-directory()}/${build.dir}">
-            <fileset basedir="${project::get-base-directory()}">
+            <fileset basedir="${project::get-base-directory()}">
-            </fileset>
+            </fileset>
-        </copy>
+        </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 prefix="OpenSim.Framework" dynamicprefix="true" >
-            </resources>
+            </resources>
-            <sources failonempty="true">
+            <sources failonempty="true">
-                <include name="AgentCiruitData.cs" />
+                <include name="AgentCiruitData.cs" />
-                <include name="AgentInventory.cs" />
+                <include name="AgentInventory.cs" />
-                <include name="AssetBase.cs" />
+                <include name="AssetBase.cs" />
-                <include name="BlockingQueue.cs" />
+                <include name="BlockingQueue.cs" />
-                <include name="HeightMapGenHills.cs" />
+                <include name="HeightMapGenHills.cs" />
-                <include name="IAssetServer.cs" />
+                <include name="IAssetServer.cs" />
-                <include name="IConfig.cs" />
+                <include name="IConfig.cs" />
-                <include name="IGenericConfig.cs" />
+                <include name="IGenericConfig.cs" />
-                <include name="IGridConfig.cs" />
+                <include name="IGridConfig.cs" />
-                <include name="IGridServer.cs" />
+                <include name="IGridServer.cs" />
-                <include name="ILocalStorage.cs" />
+                <include name="ILocalStorage.cs" />
-                <include name="IUserConfig.cs" />
+                <include name="IUserConfig.cs" />
-                <include name="IUserServer.cs" />
+                <include name="IUserServer.cs" />
-                <include name="LocalGridBase.cs" />
+                <include name="LocalGridBase.cs" />
-                <include name="Login.cs" />
+                <include name="Login.cs" />
-                <include name="LoginService.cs" />
+                <include name="LoginService.cs" />
-                <include name="NeighbourInfo.cs" />
+                <include name="NeighbourInfo.cs" />
-                <include name="PrimData.cs" />
+                <include name="PrimData.cs" />
-                <include name="RemoteGridBase.cs" />
+                <include name="RemoteGridBase.cs" />
-                <include name="SimProfile.cs" />
+                <include name="SimProfile.cs" />
-                <include name="SimProfileBase.cs" />
+                <include name="SimProfileBase.cs" />
-                <include name="UserProfile.cs" />
+                <include name="UserProfile.cs" />
-                <include name="UserProfileManager.cs" />
+                <include name="UserProfileManager.cs" />
-                <include name="UserProfileManagerBase.cs" />
+                <include name="UserProfileManagerBase.cs" />
-                <include name="Util.cs" />
+                <include name="Util.cs" />
-                <include name="Properties/AssemblyInfo.cs" />
+                <include name="Properties/AssemblyInfo.cs" />
-            </sources>
+            </sources>
-            <references basedir="${project::get-base-directory()}">
+            <references basedir="${project::get-base-directory()}">
-                <lib>
+                <lib>
-                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}" />
-                    <include name="${project::get-base-directory()}/${build.dir}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
-                </lib>
+                </lib>
-                <include name="System.dll" />
+                <include name="System.dll" />
-                <include name="System.Xml.dll" />
+                <include name="System.Xml.dll" />
-                <include name="../bin/libsecondlife.dll" />
+                <include name="../bin/libsecondlife.dll" />
-                <include name="../bin/Db4objects.Db4o.dll" />
+                <include name="../bin/Db4objects.Db4o.dll" />
-            </references>
+            </references>
-        </csc>
+        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../bin/"/>
+        <mkdir dir="${project::get-base-directory()}/../bin/"/>
-        <copy todir="${project::get-base-directory()}/../bin/">
+        <copy todir="${project::get-base-directory()}/../bin/">
-            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
-                <include name="*.dll"/>
+                <include name="*.dll"/>
-                <include name="*.exe"/>
+                <include name="*.exe"/>
-            </fileset>
+            </fileset>
-        </copy>
+        </copy>
-    </target>
+    </target>
-    <target name="clean">
+    <target name="clean">
-        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${bin.dir}" failonerror="false" />
-        <delete dir="${obj.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
-    </target>
+    </target>
-    <target name="doc" description="Creates documentation.">
+    <target name="doc" description="Creates documentation.">
-    </target>
+    </target>
-</project>
+</project>
diff --git a/OpenSim.Framework/SimProfile.cs b/OpenSim.Framework/SimProfile.cs
index ac4cf9e..fd130f0 100644
--- a/OpenSim.Framework/SimProfile.cs
+++ b/OpenSim.Framework/SimProfile.cs
@@ -16,11 +16,43 @@ namespace OpenSim.Framework.Sims
            {
                Hashtable GridReqParams = new Hashtable();
                GridReqParams["region_handle"] = region_handle.ToString();
+                GridReqParams["authkey"] = SendKey;
+                ArrayList SendParams = new ArrayList();
+                SendParams.Add(GridReqParams);
+                XmlRpcRequest GridReq = new XmlRpcRequest("simulator_login", SendParams);
+                XmlRpcResponse GridResp = GridReq.Send(GridURL, 3000);
+                Hashtable RespData = (Hashtable)GridResp.Value;
+                this.UUID = new LLUUID((string)RespData["UUID"]);
+                this.regionhandle = (ulong)Convert.ToUInt64(RespData["regionhandle"]);
+                this.regionname = (string)RespData["regionname"];
+                this.sim_ip = (string)RespData["sim_ip"];
+                this.sim_port = (uint)Convert.ToUInt16(RespData["sim_port"]);
+                this.caps_url = (string)RespData["caps_url"];
+                this.RegionLocX = (uint)Convert.ToUInt32(RespData["RegionLocX"]);
+                this.RegionLocY = (uint)Convert.ToUInt32(RespData["RegionLocY"]);
+                this.sendkey = (string)RespData["sendkey"];
+                this.recvkey = (string)RespData["recvkey"];
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e.ToString());
+            }
+            return this;
+        }
+        public SimProfile LoadFromGrid(LLUUID UUID, string GridURL, string SendKey, string RecvKey)
+        {
+            try
+            {
+                Hashtable GridReqParams = new Hashtable();
+                GridReqParams["UUID"] = UUID.ToString();
                GridReqParams["caller"] = "userserver";
                GridReqParams["authkey"] = SendKey;
                ArrayList SendParams = new ArrayList();
                SendParams.Add(GridReqParams);
-                XmlRpcRequest GridReq = new XmlRpcRequest("get_sim_info", SendParams);
+                XmlRpcRequest GridReq = new XmlRpcRequest("simulator_login", SendParams);
                XmlRpcResponse GridResp = GridReq.Send(GridURL, 3000);
@@ -42,6 +74,7 @@ namespace OpenSim.Framework.Sims
            }
            return this;
        }
        public SimProfile()
        {
diff --git a/OpenSim.Framework/UserProfileManager.cs b/OpenSim.Framework/UserProfileManager.cs
index d474834..38ca5df 100644
--- a/OpenSim.Framework/UserProfileManager.cs
+++ b/OpenSim.Framework/UserProfileManager.cs
@@ -90,8 +90,8 @@ namespace OpenSim.Framework.User
                    LLUUID AgentID = TheUser.UUID;
                    TheUser.InitSessionData();
-                    // SimProfile SimInfo = new SimProfile();
+                    SimProfile SimInfo = new SimProfile();
-                    // SimInfo = SimInfo.LoadFromGrid(TheUser.homeregionhandle, GridURL, GridSendKey, GridRecvKey);
+                    SimInfo = SimInfo.LoadFromGrid(TheUser.homeregionhandle, GridURL, GridSendKey, GridRecvKey);
                    Hashtable GlobalT = new Hashtable();
@@ -146,7 +146,7 @@ namespace OpenSim.Framework.User
                    InitialOutfit.Add(InitialOutfitHash);
                    uint circode = (uint)(Util.RandomClass.Next());
-                    //TheUser.AddSimCircuit(circode, SimInfo.UUID);
+                    TheUser.AddSimCircuit(circode, SimInfo.UUID);
                    responseData["last_name"] = TheUser.lastname;
                    responseData["ui-config"] = ui_config;
@@ -181,7 +181,7 @@ namespace OpenSim.Framework.User
                    this.CustomiseResponse(ref responseData, TheUser);
                    response.Value = responseData;
-                    //TheUser.SendDataToSim(SimInfo);
+ //                   TheUser.SendDataToSim(SimInfo);
diff --git a/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build b/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build
index f34e4ac..6335985 100644
--- a/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build
+++ b/OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build
@@ -1,42 +1,42 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" ?>
-<project name="OpenSim.GenericConfig.Xml" default="build">
+<project name="OpenSim.GenericConfig.Xml" default="build">
-    <target name="build">
+    <target name="build">
-        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
-        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
-        <copy todir="${project::get-base-directory()}/${build.dir}">
+        <copy todir="${project::get-base-directory()}/${build.dir}">
-            <fileset basedir="${project::get-base-directory()}">
+            <fileset basedir="${project::get-base-directory()}">
-            </fileset>
+            </fileset>
-        </copy>
+        </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 prefix="OpenSim.GenericConfig.Xml" dynamicprefix="true" >
-            </resources>
+            </resources>
-            <sources failonempty="true">
+            <sources failonempty="true">
-                <include name="XmlConfig.cs" />
+                <include name="XmlConfig.cs" />
-                <include name="Properties/AssemblyInfo.cs" />
+                <include name="Properties/AssemblyInfo.cs" />
-            </sources>
+            </sources>
-            <references basedir="${project::get-base-directory()}">
+            <references basedir="${project::get-base-directory()}">
-                <lib>
+                <lib>
-                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}" />
-                    <include name="${project::get-base-directory()}/${build.dir}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
-                </lib>
+                </lib>
-                <include name="System.dll" />
+                <include name="System.dll" />
-                <include name="System.Xml.dll" />
+                <include name="System.Xml.dll" />
-                <include name="../../bin/OpenSim.Framework.dll" />
+                <include name="../../bin/OpenSim.Framework.dll" />
-            </references>
+            </references>
-        </csc>
+        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../../bin/"/>
+        <mkdir dir="${project::get-base-directory()}/../../bin/"/>
-        <copy todir="${project::get-base-directory()}/../../bin/">
+        <copy todir="${project::get-base-directory()}/../../bin/">
-            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
-                <include name="*.dll"/>
+                <include name="*.dll"/>
-                <include name="*.exe"/>
+                <include name="*.exe"/>
-            </fileset>
+            </fileset>
-        </copy>
+        </copy>
-    </target>
+    </target>
-    <target name="clean">
+    <target name="clean">
-        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${bin.dir}" failonerror="false" />
-        <delete dir="${obj.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
-    </target>
+    </target>
-    <target name="doc" description="Creates documentation.">
+    <target name="doc" description="Creates documentation.">
-    </target>
+    </target>
-</project>
+</project>
diff --git a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build b/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build
index 6bf398e..c7a1966 100644
--- a/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build
+++ b/OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build
@@ -1,46 +1,46 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" ?>
-<project name="OpenSim.GridInterfaces.Local" default="build">
+<project name="OpenSim.GridInterfaces.Local" default="build">
-    <target name="build">
+    <target name="build">
-        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
-        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
-        <copy todir="${project::get-base-directory()}/${build.dir}">
+        <copy todir="${project::get-base-directory()}/${build.dir}">
-            <fileset basedir="${project::get-base-directory()}">
+            <fileset basedir="${project::get-base-directory()}">
-            </fileset>
+            </fileset>
-        </copy>
+        </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 prefix="OpenSim.GridInterfaces.Local" dynamicprefix="true" >
-            </resources>
+            </resources>
-            <sources failonempty="true">
+            <sources failonempty="true">
-                <include name="AssemblyInfo.cs" />
+                <include name="AssemblyInfo.cs" />
-                <include name="LocalAssetServer.cs" />
+                <include name="LocalAssetServer.cs" />
-                <include name="LocalGridServer.cs" />
+                <include name="LocalGridServer.cs" />
-            </sources>
+            </sources>
-            <references basedir="${project::get-base-directory()}">
+            <references basedir="${project::get-base-directory()}">
-                <lib>
+                <lib>
-                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}" />
-                    <include name="${project::get-base-directory()}/${build.dir}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
-                </lib>
+                </lib>
-                <include name="System.dll" />
+                <include name="System.dll" />
-                <include name="System.Xml.dll" />
+                <include name="System.Xml.dll" />
-                <include name="../../bin/Db4objects.Db4o.dll" />
+                <include name="../../bin/Db4objects.Db4o.dll" />
-                <include name="../../bin/libsecondlife.dll" />
+                <include name="../../bin/libsecondlife.dll" />
-                <include name="../../bin/OpenSim.Framework.dll" />
+                <include name="../../bin/OpenSim.Framework.dll" />
-                <include name="../../bin/OpenSim.Framework.Console.dll" />
+                <include name="../../bin/OpenSim.Framework.Console.dll" />
-            </references>
+            </references>
-        </csc>
+        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../../bin/"/>
+        <mkdir dir="${project::get-base-directory()}/../../bin/"/>
-        <copy todir="${project::get-base-directory()}/../../bin/">
+        <copy todir="${project::get-base-directory()}/../../bin/">
-            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
-                <include name="*.dll"/>
+                <include name="*.dll"/>
-                <include name="*.exe"/>
+                <include name="*.exe"/>
-            </fileset>
+            </fileset>
-        </copy>
+        </copy>
-    </target>
+    </target>
-    <target name="clean">
+    <target name="clean">
-        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${bin.dir}" failonerror="false" />
-        <delete dir="${obj.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
-    </target>
+    </target>
-    <target name="doc" description="Creates documentation.">
+    <target name="doc" description="Creates documentation.">
-    </target>
+    </target>
-</project>
+</project>
diff --git a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build b/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build
index dd6db18..4788f32 100644
--- a/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build
+++ b/OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build
@@ -1,45 +1,45 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" ?>
-<project name="OpenSim.GridInterfaces.Remote" default="build">
+<project name="OpenSim.GridInterfaces.Remote" default="build">
-    <target name="build">
+    <target name="build">
-        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
-        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
-        <copy todir="${project::get-base-directory()}/${build.dir}">
+        <copy todir="${project::get-base-directory()}/${build.dir}">
-            <fileset basedir="${project::get-base-directory()}">
+            <fileset basedir="${project::get-base-directory()}">
-            </fileset>
+            </fileset>
-        </copy>
+        </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 prefix="OpenSim.GridInterfaces.Remote" dynamicprefix="true" >
-            </resources>
+            </resources>
-            <sources failonempty="true">
+            <sources failonempty="true">
-                <include name="AssemblyInfo.cs" />
+                <include name="AssemblyInfo.cs" />
-                <include name="RemoteAssetServer.cs" />
+                <include name="RemoteAssetServer.cs" />
-                <include name="RemoteGridServer.cs" />
+                <include name="RemoteGridServer.cs" />
-            </sources>
+            </sources>
-            <references basedir="${project::get-base-directory()}">
+            <references basedir="${project::get-base-directory()}">
-                <lib>
+                <lib>
-                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}" />
-                    <include name="${project::get-base-directory()}/${build.dir}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
-                </lib>
+                </lib>
-                <include name="System.dll" />
+                <include name="System.dll" />
-                <include name="System.Xml.dll" />
+                <include name="System.Xml.dll" />
-                <include name="../../bin/libsecondlife.dll" />
+                <include name="../../bin/libsecondlife.dll" />
-                <include name="../../bin/OpenSim.Framework.dll" />
+                <include name="../../bin/OpenSim.Framework.dll" />
-                <include name="../../bin/OpenSim.Framework.Console.dll" />
+                <include name="../../bin/OpenSim.Framework.Console.dll" />
-            </references>
+            </references>
-        </csc>
+        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../../bin/"/>
+        <mkdir dir="${project::get-base-directory()}/../../bin/"/>
-        <copy todir="${project::get-base-directory()}/../../bin/">
+        <copy todir="${project::get-base-directory()}/../../bin/">
-            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
-                <include name="*.dll"/>
+                <include name="*.dll"/>
-                <include name="*.exe"/>
+                <include name="*.exe"/>
-            </fileset>
+            </fileset>
-        </copy>
+        </copy>
-    </target>
+    </target>
-    <target name="clean">
+    <target name="clean">
-        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${bin.dir}" failonerror="false" />
-        <delete dir="${obj.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
-    </target>
+    </target>
-    <target name="doc" description="Creates documentation.">
+    <target name="doc" description="Creates documentation.">
-    </target>
+    </target>
-</project>
+</project>
diff --git a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build b/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build
index 3497a55..7b063a3 100644
--- a/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build
+++ b/OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build
@@ -1,42 +1,42 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" ?>
-<project name="OpenSim.Physics.BasicPhysicsPlugin" default="build">
+<project name="OpenSim.Physics.BasicPhysicsPlugin" default="build">
-    <target name="build">
+    <target name="build">
-        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
-        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
-        <copy todir="${project::get-base-directory()}/${build.dir}">
+        <copy todir="${project::get-base-directory()}/${build.dir}">
-            <fileset basedir="${project::get-base-directory()}">
+            <fileset basedir="${project::get-base-directory()}">
-            </fileset>
+            </fileset>
-        </copy>
+        </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 prefix="OpenSim.Physics.BasicPhysicsPlugin" dynamicprefix="true" >
-            </resources>
+            </resources>
-            <sources failonempty="true">
+            <sources failonempty="true">
-                <include name="AssemblyInfo.cs" />
+                <include name="AssemblyInfo.cs" />
-                <include name="BasicPhysicsPlugin.cs" />
+                <include name="BasicPhysicsPlugin.cs" />
-            </sources>
+            </sources>
-            <references basedir="${project::get-base-directory()}">
+            <references basedir="${project::get-base-directory()}">
-                <lib>
+                <lib>
-                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}" />
-                    <include name="${project::get-base-directory()}/${build.dir}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
-                </lib>
+                </lib>
-                <include name="System.dll" />
+                <include name="System.dll" />
-                <include name="../../bin/Axiom.MathLib.dll" />
+                <include name="../../bin/Axiom.MathLib.dll" />
-                <include name="../../bin/OpenSim.Physics.Manager.dll" />
+                <include name="../../bin/OpenSim.Physics.Manager.dll" />
-            </references>
+            </references>
-        </csc>
+        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/Physics/" />
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/Physics/" />
-        <mkdir dir="${project::get-base-directory()}/../../bin/Physics/"/>
+        <mkdir dir="${project::get-base-directory()}/../../bin/Physics/"/>
-        <copy todir="${project::get-base-directory()}/../../bin/Physics/">
+        <copy todir="${project::get-base-directory()}/../../bin/Physics/">
-            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
-                <include name="*.dll"/>
+                <include name="*.dll"/>
-                <include name="*.exe"/>
+                <include name="*.exe"/>
-            </fileset>
+            </fileset>
-        </copy>
+        </copy>
-    </target>
+    </target>
-    <target name="clean">
+    <target name="clean">
-        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${bin.dir}" failonerror="false" />
-        <delete dir="${obj.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
-    </target>
+    </target>
-    <target name="doc" description="Creates documentation.">
+    <target name="doc" description="Creates documentation.">
-    </target>
+    </target>
-</project>
+</project>
diff --git a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build
index 4b5ee51..1554485 100644
--- a/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build
+++ b/OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build
@@ -1,47 +1,47 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" ?>
-<project name="OpenSim.Physics.Manager" default="build">
+<project name="OpenSim.Physics.Manager" default="build">
-    <target name="build">
+    <target name="build">
-        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
-        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
-        <copy todir="${project::get-base-directory()}/${build.dir}">
+        <copy todir="${project::get-base-directory()}/${build.dir}">
-            <fileset basedir="${project::get-base-directory()}">
+            <fileset basedir="${project::get-base-directory()}">
-            </fileset>
+            </fileset>
-        </copy>
+        </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 prefix="OpenSim.Physics.Manager" dynamicprefix="true" >
-            </resources>
+            </resources>
-            <sources failonempty="true">
+            <sources failonempty="true">
-                <include name="AssemblyInfo.cs" />
+                <include name="AssemblyInfo.cs" />
-                <include name="PhysicsActor.cs" />
+                <include name="PhysicsActor.cs" />
-                <include name="PhysicsManager.cs" />
+                <include name="PhysicsManager.cs" />
-                <include name="PhysicsScene.cs" />
+                <include name="PhysicsScene.cs" />
-                <include name="PhysicsVector.cs" />
+                <include name="PhysicsVector.cs" />
-            </sources>
+            </sources>
-            <references basedir="${project::get-base-directory()}">
+            <references basedir="${project::get-base-directory()}">
-                <lib>
+                <lib>
-                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}" />
-                    <include name="${project::get-base-directory()}/${build.dir}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
-                </lib>
+                </lib>
-                <include name="System.dll" />
+                <include name="System.dll" />
-                <include name="System.Xml.dll" />
+                <include name="System.Xml.dll" />
-                <include name="../../bin/Axiom.MathLib.dll" />
+                <include name="../../bin/Axiom.MathLib.dll" />
-                <include name="../../bin/OpenSim.Framework.dll" />
+                <include name="../../bin/OpenSim.Framework.dll" />
-                <include name="../../bin/OpenSim.Framework.Console.dll" />
+                <include name="../../bin/OpenSim.Framework.Console.dll" />
-            </references>
+            </references>
-        </csc>
+        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../../bin/"/>
+        <mkdir dir="${project::get-base-directory()}/../../bin/"/>
-        <copy todir="${project::get-base-directory()}/../../bin/">
+        <copy todir="${project::get-base-directory()}/../../bin/">
-            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
-                <include name="*.dll"/>
+                <include name="*.dll"/>
-                <include name="*.exe"/>
+                <include name="*.exe"/>
-            </fileset>
+            </fileset>
-        </copy>
+        </copy>
-    </target>
+    </target>
-    <target name="clean">
+    <target name="clean">
-        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${bin.dir}" failonerror="false" />
-        <delete dir="${obj.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
-    </target>
+    </target>
-    <target name="doc" description="Creates documentation.">
+    <target name="doc" description="Creates documentation.">
-    </target>
+    </target>
-</project>
+</project>
diff --git a/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build b/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build
index f25361a..098472a 100644
--- a/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build
+++ b/OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build
@@ -1,43 +1,43 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" ?>
-<project name="OpenSim.Physics.OdePlugin" default="build">
+<project name="OpenSim.Physics.OdePlugin" default="build">
-    <target name="build">
+    <target name="build">
-        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
-        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
-        <copy todir="${project::get-base-directory()}/${build.dir}">
+        <copy todir="${project::get-base-directory()}/${build.dir}">
-            <fileset basedir="${project::get-base-directory()}">
+            <fileset basedir="${project::get-base-directory()}">
-            </fileset>
+            </fileset>
-        </copy>
+        </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 prefix="OpenSim.Physics.OdePlugin" dynamicprefix="true" >
-            </resources>
+            </resources>
-            <sources failonempty="true">
+            <sources failonempty="true">
-                <include name="AssemblyInfo.cs" />
+                <include name="AssemblyInfo.cs" />
-                <include name="OdePlugin.cs" />
+                <include name="OdePlugin.cs" />
-            </sources>
+            </sources>
-            <references basedir="${project::get-base-directory()}">
+            <references basedir="${project::get-base-directory()}">
-                <lib>
+                <lib>
-                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}" />
-                    <include name="${project::get-base-directory()}/${build.dir}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
-                </lib>
+                </lib>
-                <include name="System.dll" />
+                <include name="System.dll" />
-                <include name="../../bin/Axiom.MathLib.dll" />
+                <include name="../../bin/Axiom.MathLib.dll" />
-                <include name="../../bin/OpenSim.Physics.Manager.dll" />
+                <include name="../../bin/OpenSim.Physics.Manager.dll" />
-                <include name="../../bin/Ode.NET.dll" />
+                <include name="../../bin/Ode.NET.dll" />
-            </references>
+            </references>
-        </csc>
+        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/Physics/" />
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/Physics/" />
-        <mkdir dir="${project::get-base-directory()}/../../bin/Physics/"/>
+        <mkdir dir="${project::get-base-directory()}/../../bin/Physics/"/>
-        <copy todir="${project::get-base-directory()}/../../bin/Physics/">
+        <copy todir="${project::get-base-directory()}/../../bin/Physics/">
-            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
-                <include name="*.dll"/>
+                <include name="*.dll"/>
-                <include name="*.exe"/>
+                <include name="*.exe"/>
-            </fileset>
+            </fileset>
-        </copy>
+        </copy>
-    </target>
+    </target>
-    <target name="clean">
+    <target name="clean">
-        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${bin.dir}" failonerror="false" />
-        <delete dir="${obj.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
-    </target>
+    </target>
-    <target name="doc" description="Creates documentation.">
+    <target name="doc" description="Creates documentation.">
-    </target>
+    </target>
-</project>
+</project>
diff --git a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build b/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build
index 5ab70bb..3ae7013 100644
--- a/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build
+++ b/OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build
@@ -1,43 +1,43 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" ?>
-<project name="OpenSim.Physics.PhysXPlugin" default="build">
+<project name="OpenSim.Physics.PhysXPlugin" default="build">
-    <target name="build">
+    <target name="build">
-        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
-        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
-        <copy todir="${project::get-base-directory()}/${build.dir}">
+        <copy todir="${project::get-base-directory()}/${build.dir}">
-            <fileset basedir="${project::get-base-directory()}">
+            <fileset basedir="${project::get-base-directory()}">
-            </fileset>
+            </fileset>
-        </copy>
+        </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 prefix="OpenSim.Physics.PhysXPlugin" dynamicprefix="true" >
-            </resources>
+            </resources>
-            <sources failonempty="true">
+            <sources failonempty="true">
-                <include name="AssemblyInfo.cs" />
+                <include name="AssemblyInfo.cs" />
-                <include name="PhysXPlugin.cs" />
+                <include name="PhysXPlugin.cs" />
-            </sources>
+            </sources>
-            <references basedir="${project::get-base-directory()}">
+            <references basedir="${project::get-base-directory()}">
-                <lib>
+                <lib>
-                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}" />
-                    <include name="${project::get-base-directory()}/${build.dir}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
-                </lib>
+                </lib>
-                <include name="System.dll" />
+                <include name="System.dll" />
-                <include name="../../bin/Axiom.MathLib.dll" />
+                <include name="../../bin/Axiom.MathLib.dll" />
-                <include name="../../bin/PhysX_Wrapper_Dotnet.dll" />
+                <include name="../../bin/PhysX_Wrapper_Dotnet.dll" />
-                <include name="../../bin/OpenSim.Physics.Manager.dll" />
+                <include name="../../bin/OpenSim.Physics.Manager.dll" />
-            </references>
+            </references>
-        </csc>
+        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/Physics/" />
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/Physics/" />
-        <mkdir dir="${project::get-base-directory()}/../../bin/Physics/"/>
+        <mkdir dir="${project::get-base-directory()}/../../bin/Physics/"/>
-        <copy todir="${project::get-base-directory()}/../../bin/Physics/">
+        <copy todir="${project::get-base-directory()}/../../bin/Physics/">
-            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
-                <include name="*.dll"/>
+                <include name="*.dll"/>
-                <include name="*.exe"/>
+                <include name="*.exe"/>
-            </fileset>
+            </fileset>
-        </copy>
+        </copy>
-    </target>
+    </target>
-    <target name="clean">
+    <target name="clean">
-        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${bin.dir}" failonerror="false" />
-        <delete dir="${obj.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
-    </target>
+    </target>
-    <target name="doc" description="Creates documentation.">
+    <target name="doc" description="Creates documentation.">
-    </target>
+    </target>
-</project>
+</project>
diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
index 331cfd4..cd900f5 100644
--- a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
@@ -1,82 +1,82 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" ?>
-<project name="OpenSim.RegionServer" default="build">
+<project name="OpenSim.RegionServer" default="build">
-    <target name="build">
+    <target name="build">
-        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
-        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
-        <copy todir="${project::get-base-directory()}/${build.dir}">
+        <copy todir="${project::get-base-directory()}/${build.dir}">
-            <fileset basedir="${project::get-base-directory()}">
+            <fileset basedir="${project::get-base-directory()}">
-            </fileset>
+            </fileset>
-        </copy>
+        </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 prefix="OpenSim.RegionServer" dynamicprefix="true" >
-            </resources>
+            </resources>
-            <sources failonempty="true">
+            <sources failonempty="true">
-                <include name="AgentAssetUpload.cs" />
+                <include name="AgentAssetUpload.cs" />
-                <include name="ConsoleCmds.cs" />
+                <include name="ConsoleCmds.cs" />
-                <include name="Grid.cs" />
+                <include name="Grid.cs" />
-                <include name="OpenSimMain.cs" />
+                <include name="OpenSimMain.cs" />
-                <include name="OpenSimNetworkHandler.cs" />
+                <include name="OpenSimNetworkHandler.cs" />
-                <include name="PacketServer.cs" />
+                <include name="PacketServer.cs" />
-                <include name="QueItem.cs" />
+                <include name="QueItem.cs" />
-                <include name="RegionInfo.cs" />
+                <include name="RegionInfo.cs" />
-                <include name="SimClient.cs" />
+                <include name="SimClient.cs" />
-                <include name="SimConsole.cs" />
+                <include name="SimConsole.cs" />
-                <include name="VersionInfo.cs" />
+                <include name="VersionInfo.cs" />
-                <include name="Assets/AssetCache.cs" />
+                <include name="Assets/AssetCache.cs" />
-                <include name="Assets/InventoryCache.cs" />
+                <include name="Assets/InventoryCache.cs" />
-                <include name="CAPS/AdminWebFront.cs" />
+                <include name="CAPS/AdminWebFront.cs" />
-                <include name="types/Mesh.cs" />
+                <include name="types/Mesh.cs" />
-                <include name="types/Triangle.cs" />
+                <include name="types/Triangle.cs" />
-                <include name="world/Avatar.cs" />
+                <include name="world/Avatar.cs" />
-                <include name="world/AvatarAnimations.cs" />
+                <include name="world/AvatarAnimations.cs" />
-                <include name="world/AvatarClient.cs" />
+                <include name="world/AvatarClient.cs" />
-                <include name="world/AvatarUpdate.cs" />
+                <include name="world/AvatarUpdate.cs" />
-                <include name="world/Entity.cs" />
+                <include name="world/Entity.cs" />
-                <include name="world/Primitive.cs" />
+                <include name="world/Primitive.cs" />
-                <include name="world/Primitive2.cs" />
+                <include name="world/Primitive2.cs" />
-                <include name="world/ScriptEngine.cs" />
+                <include name="world/ScriptEngine.cs" />
-                <include name="world/SurfacePatch.cs" />
+                <include name="world/SurfacePatch.cs" />
-                <include name="world/World.cs" />
+                <include name="world/World.cs" />
-                <include name="world/WorldPacketHandlers.cs" />
+                <include name="world/WorldPacketHandlers.cs" />
-                <include name="world/scripting/IScript.cs" />
+                <include name="world/scripting/IScript.cs" />
-                <include name="world/scripting/IScriptContext.cs" />
+                <include name="world/scripting/IScriptContext.cs" />
-                <include name="world/scripting/IScriptEntity.cs" />
+                <include name="world/scripting/IScriptEntity.cs" />
-                <include name="world/scripting/IScriptHandler.cs" />
+                <include name="world/scripting/IScriptHandler.cs" />
-                <include name="world/scripting/Script.cs" />
+                <include name="world/scripting/Script.cs" />
-                <include name="world/scripting/ScriptFactory.cs" />
+                <include name="world/scripting/ScriptFactory.cs" />
-                <include name="world/scripting/Scripts/FollowRandomAvatar.cs" />
+                <include name="world/scripting/Scripts/FollowRandomAvatar.cs" />
-            </sources>
+            </sources>
-            <references basedir="${project::get-base-directory()}">
+            <references basedir="${project::get-base-directory()}">
-                <lib>
+                <lib>
-                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}" />
-                    <include name="${project::get-base-directory()}/${build.dir}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
-                </lib>
+                </lib>
-                <include name="System.dll" />
+                <include name="System.dll" />
-                <include name="System.Xml.dll" />
+                <include name="System.Xml.dll" />
-                <include name="../bin/libsecondlife.dll" />
+                <include name="../bin/libsecondlife.dll" />
-                <include name="../bin/Axiom.MathLib.dll" />
+                <include name="../bin/Axiom.MathLib.dll" />
-                <include name="../bin/Db4objects.Db4o.dll" />
+                <include name="../bin/Db4objects.Db4o.dll" />
-                <include name="../bin/OpenSim.Terrain.BasicTerrain.dll" />
+                <include name="../bin/OpenSim.Terrain.BasicTerrain.dll" />
-                <include name="../bin/OpenSim.Framework.dll" />
+                <include name="../bin/OpenSim.Framework.dll" />
-                <include name="../bin/OpenSim.Framework.Console.dll" />
+                <include name="../bin/OpenSim.Framework.Console.dll" />
-                <include name="../bin/OpenSim.GenericConfig.Xml.dll" />
+                <include name="../bin/OpenSim.GenericConfig.Xml.dll" />
-                <include name="../bin/OpenSim.Physics.Manager.dll" />
+                <include name="../bin/OpenSim.Physics.Manager.dll" />
-                <include name="../bin/OpenSim.Servers.dll" />
+                <include name="../bin/OpenSim.Servers.dll" />
-            </references>
+            </references>
-        </csc>
+        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../bin/"/>
+        <mkdir dir="${project::get-base-directory()}/../bin/"/>
-        <copy todir="${project::get-base-directory()}/../bin/">
+        <copy todir="${project::get-base-directory()}/../bin/">
-            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
-                <include name="*.dll"/>
+                <include name="*.dll"/>
-                <include name="*.exe"/>
+                <include name="*.exe"/>
-            </fileset>
+            </fileset>
-        </copy>
+        </copy>
-    </target>
+    </target>
-    <target name="clean">
+    <target name="clean">
-        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${bin.dir}" failonerror="false" />
-        <delete dir="${obj.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
-    </target>
+    </target>
-    <target name="doc" description="Creates documentation.">
+    <target name="doc" description="Creates documentation.">
-    </target>
+    </target>
-</project>
+</project>
diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim.RegionServer/OpenSimMain.cs
index 34fa243..d36dbfc 100644
--- a/OpenSim.RegionServer/OpenSimMain.cs
+++ b/OpenSim.RegionServer/OpenSimMain.cs
@@ -114,7 +114,6 @@ namespace OpenSim
            }
            m_console.WriteLine("Main.cs:Startup() - Loading configuration");
            this.regionData.InitConfig(this.m_sandbox, this.localConfig);
-            //regionData.SimUUID = new LLUUID(localConfig.GetAttribute("SimUUID")); //don't need as regionData.SimUUID is already set through the above line
            this.localConfig.Close();//for now we can close it as no other classes read from it , but this should change
diff --git a/OpenSim.RegionServer/RegionInfo.cs b/OpenSim.RegionServer/RegionInfo.cs
index cf0c075..e120198 100644
--- a/OpenSim.RegionServer/RegionInfo.cs
+++ b/OpenSim.RegionServer/RegionInfo.cs
@@ -1,6 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using System.Net;
+using System.Web;
+using System.IO;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Utilities;
 using libsecondlife;
@@ -34,7 +37,37 @@ namespace OpenSim
        public RegionInfo()
        {
-        }
+        }
+        public void SaveToGrid()
+        {
+                    string reqtext;
+                    reqtext="<authkey>" + this.GridSendKey + "</authkey>";
+                    reqtext+="<sim>";
+                    reqtext+="<uuid>" + this.SimUUID.ToString() + "</uuid>";
+                    reqtext+="<regionname>" + this.RegionName + "</regionname>";
+                    reqtext+="<sim_ip>" + this.IPListenAddr + "</sim_ip>";
+                    reqtext+="<sim_port>" + this.IPListenPort.ToString() + "</sim_port>";
+                    reqtext+="<region_locx>" + this.RegionLocX.ToString() + "</region_locx>";
+                    reqtext+="<region_locy>" + this.RegionLocY.ToString() + "</region_locy>";
+                    reqtext+="<estate_id>1</estate_id>";
+                    reqtext+="</sim>";
+                    WebRequest GridSaveReq = WebRequest.Create(this.GridURL + "sims/" + this.SimUUID.ToString());
+                    GridSaveReq.Method = "POST";
+                    GridSaveReq.ContentType = "text/plaintext";
+                    GridSaveReq.ContentLength = reqtext.Length;
+                    StreamWriter stOut = new StreamWriter(GridSaveReq.GetRequestStream(), System.Text.Encoding.ASCII);
+                    stOut.Write(reqtext);
+                    stOut.Close();
+                    StreamReader stIn = new StreamReader(GridSaveReq.GetResponse().GetResponseStream());
+                    string GridResponse = stIn.ReadToEnd();
+                    stIn.Close();
+                    
+                    OpenSim.Framework.Console.MainConsole.Instance.WriteLine("RegionInfo.CS:SaveToGrid() - Grid said: " + GridResponse);
+        }
        public void InitConfig(bool sandboxMode, IGenericConfig configData)
        {
@@ -122,31 +155,7 @@ namespace OpenSim
                {
                    //shouldn't be reading this data in here, it should be up to the classes implementing the server interfaces to read what they need from the config object
-                    // Asset Server URL
+                    //Grid Server URL
-                    attri = "";
-                    attri = configData.GetAttribute("AssetServerURL");
-                    if (attri == "")
-                    {
-                        this.AssetURL = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Asset server URL: ");
-                        configData.SetAttribute("AssetServerURL", this.AssetURL);
-                    }
-                    else
-                    {
-                        this.AssetURL = attri;
-                    }
-                    //Asset Server key
-                    attri = "";
-                    attri = configData.GetAttribute("AssetServerKey");
-                    if (attri == "")
-                    {
-                        this.AssetSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Asset server key: ");
-                        configData.SetAttribute("AssetServerKey", this.AssetSendKey);
-                    }
-                    else
-                    {
-                        this.AssetSendKey = attri;
-                    }
-                    //Grid Sever URL
                    attri = "";
                    attri = configData.GetAttribute("GridServerURL");
                    if (attri == "")
@@ -158,6 +167,7 @@ namespace OpenSim
                    {
                        this.GridURL = attri;
                    }
                    //Grid Send Key
                    attri = "";
                    attri = configData.GetAttribute("GridSendKey");
@@ -170,6 +180,7 @@ namespace OpenSim
                    {
                        this.GridSendKey = attri;
                    }
                    //Grid Receive Key
                    attri = "";
                    attri = configData.GetAttribute("GridRecvKey");
@@ -181,45 +192,12 @@ namespace OpenSim
                    else
                    {
                        this.GridRecvKey = attri;
-                    }
+                    }
-                    //User Server URL
-                    attri = "";
-                    attri = configData.GetAttribute("UserServerURL");
-                    if (attri == "")
-                    {
-                        this.UserURL = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("User server URL: ");
-                        configData.SetAttribute("UserServerURL", this.UserURL);
-                    }
-                    else
-                    {
-                        this.UserURL = attri;
-                    }
-                    //User Send Key
-                    attri = "";
-                    attri = configData.GetAttribute("UserSendKey");
-                    if (attri == "")
-                    {
-                        this.UserSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to user server: ");
-                        configData.SetAttribute("UserSendKey", this.UserSendKey);
-                    }
-                    else
-                    {
-                        this.UserSendKey = attri;
-                    }
-                    //User Receive Key
-                    attri = "";
-                    attri = configData.GetAttribute("UserRecvKey");
-                    if (attri == "")
-                    {
-                        this.UserRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from user server: ");
-                        configData.SetAttribute("UserRecvKey", this.UserRecvKey);
-                    }
-                    else
-                    {
-                        this.UserRecvKey = attri;
-                    }
                }
                this.RegionHandle = Util.UIntsToLong((RegionLocX * 256), (RegionLocY * 256));
+                this.SaveToGrid();
                configData.Commit();
            }
            catch (Exception e)
diff --git a/OpenSim.Storage.LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build b/OpenSim.Storage.LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build
index f28d224..9592c1e 100644
--- a/OpenSim.Storage.LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build
+++ b/OpenSim.Storage.LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build
@@ -1,47 +1,47 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" ?>
-<project name="OpenSim.Storage.LocalStorageBerkeleyDB" default="build">
+<project name="OpenSim.Storage.LocalStorageBerkeleyDB" default="build">
-    <target name="build">
+    <target name="build">
-        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
-        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
-        <copy todir="${project::get-base-directory()}/${build.dir}">
+        <copy todir="${project::get-base-directory()}/${build.dir}">
-            <fileset basedir="${project::get-base-directory()}">
+            <fileset basedir="${project::get-base-directory()}">
-            </fileset>
+            </fileset>
-        </copy>
+        </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 prefix="OpenSim.Storage.LocalStorageBerkeleyDB" dynamicprefix="true" >
-            </resources>
+            </resources>
-            <sources failonempty="true">
+            <sources failonempty="true">
-                <include name="BDBLocalStorage.cs" />
+                <include name="BDBLocalStorage.cs" />
-                <include name="Properties/AssemblyInfo.cs" />
+                <include name="Properties/AssemblyInfo.cs" />
-            </sources>
+            </sources>
-            <references basedir="${project::get-base-directory()}">
+            <references basedir="${project::get-base-directory()}">
-                <lib>
+                <lib>
-                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}" />
-                    <include name="${project::get-base-directory()}/${build.dir}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
-                </lib>
+                </lib>
-                <include name="System.dll" />
+                <include name="System.dll" />
-                <include name="System.Xml.dll" />
+                <include name="System.Xml.dll" />
-                <include name="System.Data.dll" />
+                <include name="System.Data.dll" />
-                <include name="../bin/Kds.Serialization.dll" />
+                <include name="../bin/Kds.Serialization.dll" />
-                <include name="../bin/libDB_dotNET43.dll" />
+                <include name="../bin/libdb_dotNET43.dll" />
-                <include name="../bin/libsecondlife.dll" />
+                <include name="../bin/libsecondlife.dll" />
-                <include name="../bin/OpenSim.Framework.dll" />
+                <include name="../bin/OpenSim.Framework.dll" />
-                <include name="../bin/OpenSim.Framework.Console.dll" />
+                <include name="../bin/OpenSim.Framework.Console.dll" />
-            </references>
+            </references>
-        </csc>
+        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../bin/"/>
+        <mkdir dir="${project::get-base-directory()}/../bin/"/>
-        <copy todir="${project::get-base-directory()}/../bin/">
+        <copy todir="${project::get-base-directory()}/../bin/">
-            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
-                <include name="*.dll"/>
+                <include name="*.dll"/>
-                <include name="*.exe"/>
+                <include name="*.exe"/>
-            </fileset>
+            </fileset>
-        </copy>
+        </copy>
-    </target>
+    </target>
-    <target name="clean">
+    <target name="clean">
-        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${bin.dir}" failonerror="false" />
-        <delete dir="${obj.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
-    </target>
+    </target>
-    <target name="doc" description="Creates documentation.">
+    <target name="doc" description="Creates documentation.">
-    </target>
+    </target>
-</project>
+</project>
diff --git a/OpenSim.Storage.LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build b/OpenSim.Storage.LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build
index f3a6683..c3699af 100644
--- a/OpenSim.Storage.LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build
+++ b/OpenSim.Storage.LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build
@@ -1,46 +1,46 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" ?>
-<project name="OpenSim.Storage.LocalStorageSQLite" default="build">
+<project name="OpenSim.Storage.LocalStorageSQLite" default="build">
-    <target name="build">
+    <target name="build">
-        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
-        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
-        <copy todir="${project::get-base-directory()}/${build.dir}">
+        <copy todir="${project::get-base-directory()}/${build.dir}">
-            <fileset basedir="${project::get-base-directory()}">
+            <fileset basedir="${project::get-base-directory()}">
-            </fileset>
+            </fileset>
-        </copy>
+        </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 prefix="OpenSim.Storage.LocalStorageSQLite" dynamicprefix="true" >
-            </resources>
+            </resources>
-            <sources failonempty="true">
+            <sources failonempty="true">
-                <include name="SQLiteLocalStorage.cs" />
+                <include name="SQLiteLocalStorage.cs" />
-                <include name="Properties/AssemblyInfo.cs" />
+                <include name="Properties/AssemblyInfo.cs" />
-            </sources>
+            </sources>
-            <references basedir="${project::get-base-directory()}">
+            <references basedir="${project::get-base-directory()}">
-                <lib>
+                <lib>
-                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}" />
-                    <include name="${project::get-base-directory()}/${build.dir}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
-                </lib>
+                </lib>
-                <include name="System.dll" />
+                <include name="System.dll" />
-                <include name="System.Xml.dll" />
+                <include name="System.Xml.dll" />
-                <include name="System.Data.dll" />
+                <include name="System.Data.dll" />
-                <include name="../bin/System.Data.SQLite.dll" />
+                <include name="../bin/System.Data.SQLite.dll" />
-                <include name="../bin/libsecondlife.dll" />
+                <include name="../bin/libsecondlife.dll" />
-                <include name="../bin/OpenSim.Framework.dll" />
+                <include name="../bin/OpenSim.Framework.dll" />
-                <include name="../bin/OpenSim.Framework.Console.dll" />
+                <include name="../bin/OpenSim.Framework.Console.dll" />
-            </references>
+            </references>
-        </csc>
+        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../bin/"/>
+        <mkdir dir="${project::get-base-directory()}/../bin/"/>
-        <copy todir="${project::get-base-directory()}/../bin/">
+        <copy todir="${project::get-base-directory()}/../bin/">
-            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
-                <include name="*.dll"/>
+                <include name="*.dll"/>
-                <include name="*.exe"/>
+                <include name="*.exe"/>
-            </fileset>
+            </fileset>
-        </copy>
+        </copy>
-    </target>
+    </target>
-    <target name="clean">
+    <target name="clean">
-        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${bin.dir}" failonerror="false" />
-        <delete dir="${obj.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
-    </target>
+    </target>
-    <target name="doc" description="Creates documentation.">
+    <target name="doc" description="Creates documentation.">
-    </target>
+    </target>
-</project>
+</project>
diff --git a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build b/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
index 8be321d..439f440 100644
--- a/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
+++ b/OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build
@@ -1,47 +1,47 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" ?>
-<project name="OpenSim.Storage.LocalStorageDb4o" default="build">
+<project name="OpenSim.Storage.LocalStorageDb4o" default="build">
-    <target name="build">
+    <target name="build">
-        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
-        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
-        <copy todir="${project::get-base-directory()}/${build.dir}">
+        <copy todir="${project::get-base-directory()}/${build.dir}">
-            <fileset basedir="${project::get-base-directory()}">
+            <fileset basedir="${project::get-base-directory()}">
-            </fileset>
+            </fileset>
-        </copy>
+        </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 prefix="OpenSim.Storage.LocalStorageDb4o" dynamicprefix="true" >
-            </resources>
+            </resources>
-            <sources failonempty="true">
+            <sources failonempty="true">
-                <include name="AssemblyInfo.cs" />
+                <include name="AssemblyInfo.cs" />
-                <include name="Db4LocalStorage.cs" />
+                <include name="Db4LocalStorage.cs" />
-                <include name="MapStorage.cs" />
+                <include name="MapStorage.cs" />
-                <include name="UUIDQuery.cs" />
+                <include name="UUIDQuery.cs" />
-            </sources>
+            </sources>
-            <references basedir="${project::get-base-directory()}">
+            <references basedir="${project::get-base-directory()}">
-                <lib>
+                <lib>
-                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}" />
-                    <include name="${project::get-base-directory()}/${build.dir}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
-                </lib>
+                </lib>
-                <include name="System.dll" />
+                <include name="System.dll" />
-                <include name="System.Xml.dll" />
+                <include name="System.Xml.dll" />
-                <include name="../../bin/Db4objects.Db4o.dll" />
+                <include name="../../bin/Db4objects.Db4o.dll" />
-                <include name="../../bin/libsecondlife.dll" />
+                <include name="../../bin/libsecondlife.dll" />
-                <include name="../../bin/OpenSim.Framework.dll" />
+                <include name="../../bin/OpenSim.Framework.dll" />
-                <include name="../../bin/OpenSim.Framework.Console.dll" />
+                <include name="../../bin/OpenSim.Framework.Console.dll" />
-            </references>
+            </references>
-        </csc>
+        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../../bin/"/>
+        <mkdir dir="${project::get-base-directory()}/../../bin/"/>
-        <copy todir="${project::get-base-directory()}/../../bin/">
+        <copy todir="${project::get-base-directory()}/../../bin/">
-            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
-                <include name="*.dll"/>
+                <include name="*.dll"/>
-                <include name="*.exe"/>
+                <include name="*.exe"/>
-            </fileset>
+            </fileset>
-        </copy>
+        </copy>
-    </target>
+    </target>
-    <target name="clean">
+    <target name="clean">
-        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${bin.dir}" failonerror="false" />
-        <delete dir="${obj.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
-    </target>
+    </target>
-    <target name="doc" description="Creates documentation.">
+    <target name="doc" description="Creates documentation.">
-    </target>
+    </target>
-</project>
+</project>
diff --git a/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build b/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build
index d2e6c9f..2c43aa0 100644
--- a/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build
+++ b/OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build
@@ -1,43 +1,43 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" ?>
-<project name="OpenSim.Terrain.BasicTerrain" default="build">
+<project name="OpenSim.Terrain.BasicTerrain" default="build">
-    <target name="build">
+    <target name="build">
-        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
-        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
-        <copy todir="${project::get-base-directory()}/${build.dir}">
+        <copy todir="${project::get-base-directory()}/${build.dir}">
-            <fileset basedir="${project::get-base-directory()}">
+            <fileset basedir="${project::get-base-directory()}">
-            </fileset>
+            </fileset>
-        </copy>
+        </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 prefix="OpenSim.Terrain.BasicTerrain" dynamicprefix="true" >
-            </resources>
+            </resources>
-            <sources failonempty="true">
+            <sources failonempty="true">
-                <include name="TerrainEngine.cs" />
+                <include name="TerrainEngine.cs" />
-                <include name="Properties/AssemblyInfo.cs" />
+                <include name="Properties/AssemblyInfo.cs" />
-            </sources>
+            </sources>
-            <references basedir="${project::get-base-directory()}">
+            <references basedir="${project::get-base-directory()}">
-                <lib>
+                <lib>
-                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}" />
-                    <include name="${project::get-base-directory()}/${build.dir}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
-                </lib>
+                </lib>
-                <include name="../bin/libTerrain-BSD.dll" />
+                <include name="../bin/libTerrain-BSD.dll" />
-                <include name="System.dll" />
+                <include name="System.dll" />
-                <include name="System.Data.dll" />
+                <include name="System.Data.dll" />
-                <include name="System.Xml.dll" />
+                <include name="System.Xml.dll" />
-            </references>
+            </references>
-        </csc>
+        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../bin/"/>
+        <mkdir dir="${project::get-base-directory()}/../bin/"/>
-        <copy todir="${project::get-base-directory()}/../bin/">
+        <copy todir="${project::get-base-directory()}/../bin/">
-            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
-                <include name="*.dll"/>
+                <include name="*.dll"/>
-                <include name="*.exe"/>
+                <include name="*.exe"/>
-            </fileset>
+            </fileset>
-        </copy>
+        </copy>
-    </target>
+    </target>
-    <target name="clean">
+    <target name="clean">
-        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${bin.dir}" failonerror="false" />
-        <delete dir="${obj.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
-    </target>
+    </target>
-    <target name="doc" description="Creates documentation.">
+    <target name="doc" description="Creates documentation.">
-    </target>
+    </target>
-</project>
+</project>
diff --git a/OpenSim.build b/OpenSim.build
index a807110..6d9df46 100644
--- a/OpenSim.build
+++ b/OpenSim.build
@@ -1,124 +1,124 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" ?>
-<project name="OpenSim" default="build">
+<project name="OpenSim" default="build">
-    <echo message="Using '${nant.settings.currentframework}' Framework"/>
+    <echo message="Using '${nant.settings.currentframework}' Framework"/>
-    <property name="bin.dir" value="bin" />
+    <property name="bin.dir" value="bin" />
-    <property name="obj.dir" value="obj" />
+    <property name="obj.dir" value="obj" />
-    <property name="doc.dir" value="doc" />
+    <property name="doc.dir" value="doc" />
-    <property name="project.main.dir" value="${project::get-base-directory()}" />
+    <property name="project.main.dir" value="${project::get-base-directory()}" />
+    <property name="project.config" value="Release" />
-    <target name="Debug" description="">
-        <property name="project.config" value="Debug" />
+    <target name="Release" description="">
-        <property name="build.debug" value="true" />
+        <property name="project.config" value="Release" />
-    </target>
+        <property name="build.debug" value="false" />
+    </target>
-    <property name="project.config" value="Release" />
-    <target name="Release" description="">
+    <target name="Debug" description="">
-        <property name="project.config" value="Release" />
+        <property name="project.config" value="Debug" />
-        <property name="build.debug" value="false" />
+        <property name="build.debug" value="true" />
-    </target>
+    </target>
-    <target name="net-1.1" description="Sets framework to .NET 1.1">
+    <target name="net-1.1" description="Sets framework to .NET 1.1">
-        <property name="nant.settings.currentframework" value="net-1.1" />
+        <property name="nant.settings.currentframework" value="net-1.1" />
-    </target>
+    </target>
-    <target name="net-2.0" description="Sets framework to .NET 2.0">
+    <target name="net-2.0" description="Sets framework to .NET 2.0">
-        <property name="nant.settings.currentframework" value="net-2.0" />
+        <property name="nant.settings.currentframework" value="net-2.0" />
-    </target>
+    </target>
-    <target name="mono-2.0" description="Sets framework to mono 2.0">
+    <target name="mono-2.0" description="Sets framework to mono 2.0">
-        <property name="nant.settings.currentframework" value="mono-2.0" />
+        <property name="nant.settings.currentframework" value="mono-2.0" />
-    </target>
+    </target>
-    <target name="mono-1.0" description="Sets framework to mono 1.0">
+    <target name="mono-1.0" description="Sets framework to mono 1.0">
-        <property name="nant.settings.currentframework" value="mono-1.0" />
+        <property name="nant.settings.currentframework" value="mono-1.0" />
-    </target>
+    </target>
-    <target name="init" description="">
+    <target name="init" description="">
-        <call target="${project.config}" />
+        <call target="${project.config}" />
-        <sysinfo />
+        <sysinfo />
-        <echo message="Platform ${sys.os.platform}" />
+        <echo message="Platform ${sys.os.platform}" />
-        <property name="build.dir" value="${bin.dir}/${project.config}" />
+        <property name="build.dir" value="${bin.dir}/${project.config}" />
-    </target>
+    </target>
-    <target name="clean" description="">
+    <target name="clean" description="">
-        <echo message="Deleting all builds from all configurations" />
+        <echo message="Deleting all builds from all configurations" />
-        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${bin.dir}" failonerror="false" />
-        <delete dir="${obj.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.LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="clean" />
-        <nant buildfile="OpenSim.Storage.LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build" target="clean" />
+        <nant buildfile="OpenSim.Framework/OpenSim.Framework.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.Framework.Console/OpenSim.Framework.Console.dll.build" target="clean" />
+        <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="clean" />
-        <nant buildfile="OpenSim/OpenSim.exe.build" target="clean" />
+        <nant buildfile="Servers/OpenSim.Servers.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="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="clean" />
+        <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="clean" />
-        <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="clean" />
+        <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="clean" />
-        <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="clean" />
+        <nant buildfile="OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="clean" />
-        <nant buildfile="OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="clean" />
+        <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="clean" />
-        <nant buildfile="Servers/OpenSim.Servers.dll.build" target="clean" />
+        <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="clean" />
-        <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.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="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="clean" />
-        <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="clean" />
+        <nant buildfile="OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="clean" />
-        <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.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="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="clean" />
-        <nant buildfile="OpenSim.Storage.LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="clean" />
+        <nant buildfile="OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build" target="clean" />
-        <nant buildfile="OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.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.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="clean" />
-        <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="clean" />
+        <nant buildfile="OpenSim.Storage.LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build" target="clean" />
-    </target>
+    </target>
-    <target name="build" depends="init" description="">
+    <target name="build" depends="init" description="">
-        <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="build" />
+        <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="build" />
-        <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="build" />
+        <nant buildfile="OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build" target="build" />
-        <nant buildfile="Servers/OpenSim.Servers.dll.build" target="build" />
+        <nant buildfile="Servers/OpenSim.Servers.dll.build" target="build" />
-        <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="build" />
+        <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="build" />
-        <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="build" />
+        <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="build" />
-        <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="build" />
+        <nant buildfile="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="build" />
-        <nant buildfile="OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="build" />
+        <nant buildfile="OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="build" />
-        <nant buildfile="OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build" target="build" />
+        <nant buildfile="OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build" target="build" />
-        <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="build" />
+        <nant buildfile="OpenSim.GridInterfaces/Local/OpenSim.GridInterfaces.Local.dll.build" target="build" />
-        <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="build" />
+        <nant buildfile="OpenSim.GridInterfaces/Remote/OpenSim.GridInterfaces.Remote.dll.build" target="build" />
-        <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="build" />
+        <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="build" />
-        <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="build" />
+        <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="build" />
-        <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="build" />
+        <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="build" />
-        <nant buildfile="OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="build" />
+        <nant buildfile="OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="build" />
-        <nant buildfile="OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="build" />
+        <nant buildfile="OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="build" />
-        <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="build" />
+        <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="build" />
-        <nant buildfile="OpenSim/OpenSim.exe.build" target="build" />
+        <nant buildfile="OpenSim/OpenSim.exe.build" target="build" />
-        <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="build" />
+        <nant buildfile="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="build" />
-        <nant buildfile="OpenSim.Storage.LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="build" />
+        <nant buildfile="OpenSim.Storage.LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="build" />
-        <nant buildfile="OpenSim.Storage.LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build" target="build" />
+        <nant buildfile="OpenSim.Storage.LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build" target="build" />
-    </target>
+    </target>
-    <target name="build-release" depends="Release, init, build" description="Builds in Release mode" />
+    <target name="build-release" depends="Release, init, build" description="Builds in Release mode" />
-    <target name="build-debug" depends="Debug, init, build" description="Builds in Debug mode" />
+    <target name="build-debug" depends="Debug, init, build" description="Builds in Debug mode" />
-    <target name="package" depends="clean, doc" description="Builds all" />
+    <target name="package" depends="clean, doc" description="Builds all" />
-    <target name="doc" depends="build-release">
+    <target name="doc" depends="build-release">
-        <echo message="Generating all documentation from all builds" />
+        <echo message="Generating all documentation from all builds" />
-        <nant buildfile="OpenSim.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="doc" />
+        <nant buildfile="OpenSim.Storage.LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="doc" />
-        <nant buildfile="OpenSim.Storage.LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build" target="doc" />
+        <nant buildfile="OpenSim.Framework/OpenSim.Framework.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.Framework.Console/OpenSim.Framework.Console.dll.build" target="doc" />
+        <nant buildfile="OpenSim.Physics/OdePlugin/OpenSim.Physics.OdePlugin.dll.build" target="doc" />
-        <nant buildfile="OpenSim/OpenSim.exe.build" target="doc" />
+        <nant buildfile="Servers/OpenSim.Servers.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="OpenSim.Physics/Manager/OpenSim.Physics.Manager.dll.build" target="doc" />
+        <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="doc" />
-        <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="doc" />
+        <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.dll.build" target="doc" />
-        <nant buildfile="OpenSim.Physics/BasicPhysicsPlugin/OpenSim.Physics.BasicPhysicsPlugin.dll.build" target="doc" />
+        <nant buildfile="OpenSim.GenericConfig/Xml/OpenSim.GenericConfig.Xml.dll.build" target="doc" />
-        <nant buildfile="OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="doc" />
+        <nant buildfile="OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build" target="doc" />
-        <nant buildfile="Servers/OpenSim.Servers.dll.build" target="doc" />
+        <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="doc" />
-        <nant buildfile="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.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="OpenSim.Physics/PhysXPlugin/OpenSim.Physics.PhysXPlugin.dll.build" target="doc" />
-        <nant buildfile="OpenSim.Framework/OpenSim.Framework.dll.build" target="doc" />
+        <nant buildfile="OpenGrid.Config/GridConfigDb4o/OpenGrid.Config.GridConfigDb4o.dll.build" target="doc" />
-        <nant buildfile="OpenSim.RegionServer/OpenSim.RegionServer.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="OpenSim.Storage/LocalStorageDb4o/OpenSim.Storage.LocalStorageDb4o.dll.build" target="doc" />
-        <nant buildfile="OpenSim.Storage.LocalStorageSQLite/OpenSim.Storage.LocalStorageSQLite.dll.build" target="doc" />
+        <nant buildfile="OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build" target="doc" />
-        <nant buildfile="OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.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.Terrain.BasicTerrain/OpenSim.Terrain.BasicTerrain.dll.build" target="doc" />
-        <nant buildfile="OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build" target="doc" />
+        <nant buildfile="OpenSim.Storage.LocalStorageBerkeleyDB/OpenSim.Storage.LocalStorageBerkeleyDB.dll.build" target="doc" />
-    </target>
+    </target>
-</project>
+</project>
diff --git a/OpenSim/OpenSim.exe.build b/OpenSim/OpenSim.exe.build
index 02445df..54b7a3b 100644
--- a/OpenSim/OpenSim.exe.build
+++ b/OpenSim/OpenSim.exe.build
@@ -1,48 +1,48 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" ?>
-<project name="OpenSim" default="build">
+<project name="OpenSim" default="build">
-    <target name="build">
+    <target name="build">
-        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
-        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
-        <copy todir="${project::get-base-directory()}/${build.dir}">
+        <copy todir="${project::get-base-directory()}/${build.dir}">
-            <fileset basedir="${project::get-base-directory()}">
+            <fileset basedir="${project::get-base-directory()}">
-            </fileset>
+            </fileset>
-        </copy>
+        </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 prefix="OpenSim" dynamicprefix="true" >
-            </resources>
+            </resources>
-            <sources failonempty="true">
+            <sources failonempty="true">
-                <include name="Application.cs" />
+                <include name="Application.cs" />
-            </sources>
+            </sources>
-            <references basedir="${project::get-base-directory()}">
+            <references basedir="${project::get-base-directory()}">
-                <lib>
+                <lib>
-                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}" />
-                    <include name="${project::get-base-directory()}/${build.dir}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
-                </lib>
+                </lib>
-                <include name="System.dll" />
+                <include name="System.dll" />
-                <include name="System.Xml.dll" />
+                <include name="System.Xml.dll" />
-                <include name="../bin/libsecondlife.dll" />
+                <include name="../bin/libsecondlife.dll" />
-                <include name="../bin/Axiom.MathLib.dll" />
+                <include name="../bin/Axiom.MathLib.dll" />
-                <include name="../bin/Db4objects.Db4o.dll" />
+                <include name="../bin/Db4objects.Db4o.dll" />
-                <include name="../bin/OpenSim.Framework.dll" />
+                <include name="../bin/OpenSim.Framework.dll" />
-                <include name="../bin/OpenSim.Framework.Console.dll" />
+                <include name="../bin/OpenSim.Framework.Console.dll" />
-                <include name="../bin/OpenSim.Physics.Manager.dll" />
+                <include name="../bin/OpenSim.Physics.Manager.dll" />
-                <include name="../bin/OpenSim.Servers.dll" />
+                <include name="../bin/OpenSim.Servers.dll" />
-                <include name="../bin/OpenSim.RegionServer.dll" />
+                <include name="../bin/OpenSim.RegionServer.dll" />
-            </references>
+            </references>
-        </csc>
+        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../bin/"/>
+        <mkdir dir="${project::get-base-directory()}/../bin/"/>
-        <copy todir="${project::get-base-directory()}/../bin/">
+        <copy todir="${project::get-base-directory()}/../bin/">
-            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
-                <include name="*.dll"/>
+                <include name="*.dll"/>
-                <include name="*.exe"/>
+                <include name="*.exe"/>
-            </fileset>
+            </fileset>
-        </copy>
+        </copy>
-    </target>
+    </target>
-    <target name="clean">
+    <target name="clean">
-        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${bin.dir}" failonerror="false" />
-        <delete dir="${obj.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
-    </target>
+    </target>
-    <target name="doc" description="Creates documentation.">
+    <target name="doc" description="Creates documentation.">
-    </target>
+    </target>
-</project>
+</project>
diff --git a/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build b/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build
index 8494a0b..0abcfa1 100644
--- a/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build
+++ b/OpenUser.Config/UserConfigDb4o/OpenUser.Config.UserConfigDb4o.dll.build
@@ -1,46 +1,46 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" ?>
-<project name="OpenUser.Config.UserConfigDb4o" default="build">
+<project name="OpenUser.Config.UserConfigDb4o" default="build">
-    <target name="build">
+    <target name="build">
-        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
-        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
-        <copy todir="${project::get-base-directory()}/${build.dir}">
+        <copy todir="${project::get-base-directory()}/${build.dir}">
-            <fileset basedir="${project::get-base-directory()}">
+            <fileset basedir="${project::get-base-directory()}">
-            </fileset>
+            </fileset>
-        </copy>
+        </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 prefix="OpenUser.Config.UserConfigDb4o" dynamicprefix="true" >
-            </resources>
+            </resources>
-            <sources failonempty="true">
+            <sources failonempty="true">
-                <include name="AssemblyInfo.cs" />
+                <include name="AssemblyInfo.cs" />
-                <include name="DbUserConfig.cs" />
+                <include name="DbUserConfig.cs" />
-            </sources>
+            </sources>
-            <references basedir="${project::get-base-directory()}">
+            <references basedir="${project::get-base-directory()}">
-                <lib>
+                <lib>
-                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}" />
-                    <include name="${project::get-base-directory()}/${build.dir}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
-                </lib>
+                </lib>
-                <include name="System.dll" />
+                <include name="System.dll" />
-                <include name="System.Data.dll.dll" />
+                <include name="System.Data.dll.dll" />
-                <include name="System.Xml.dll" />
+                <include name="System.Xml.dll" />
-                <include name="../../bin/libsecondlife.dll" />
+                <include name="../../bin/libsecondlife.dll" />
-                <include name="../../bin/Db4objects.Db4o.dll" />
+                <include name="../../bin/Db4objects.Db4o.dll" />
-                <include name="../../bin/OpenSim.Framework.dll" />
+                <include name="../../bin/OpenSim.Framework.dll" />
-                <include name="../../bin/OpenSim.Framework.Console.dll" />
+                <include name="../../bin/OpenSim.Framework.Console.dll" />
-            </references>
+            </references>
-        </csc>
+        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../../bin/"/>
+        <mkdir dir="${project::get-base-directory()}/../../bin/"/>
-        <copy todir="${project::get-base-directory()}/../../bin/">
+        <copy todir="${project::get-base-directory()}/../../bin/">
-            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
-                <include name="*.dll"/>
+                <include name="*.dll"/>
-                <include name="*.exe"/>
+                <include name="*.exe"/>
-            </fileset>
+            </fileset>
-        </copy>
+        </copy>
-    </target>
+    </target>
-    <target name="clean">
+    <target name="clean">
-        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${bin.dir}" failonerror="false" />
-        <delete dir="${obj.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
-    </target>
+    </target>
-    <target name="doc" description="Creates documentation.">
+    <target name="doc" description="Creates documentation.">
-    </target>
+    </target>
-</project>
+</project>
diff --git a/Prebuild/Prebuild.build b/Prebuild/Prebuild.build
index 395fb31..743b826 100644
--- a/Prebuild/Prebuild.build
+++ b/Prebuild/Prebuild.build
@@ -1,67 +1,67 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" ?>
-<project name="Prebuild" default="build">
+<project name="Prebuild" default="build">
-    <echo message="Using '${nant.settings.currentframework}' Framework"/>
+    <echo message="Using '${nant.settings.currentframework}' Framework"/>
-    <property name="bin.dir" value="bin" />
+    <property name="bin.dir" value="bin" />
-    <property name="obj.dir" value="obj" />
+    <property name="obj.dir" value="obj" />
-    <property name="doc.dir" value="doc" />
+    <property name="doc.dir" value="doc" />
-    <property name="project.main.dir" value="${project::get-base-directory()}" />
+    <property name="project.main.dir" value="${project::get-base-directory()}" />
+    <property name="project.config" value="Release" />
-    <target name="Debug" description="">
-        <property name="project.config" value="Debug" />
+    <target name="Release" description="">
-        <property name="build.debug" value="true" />
+        <property name="project.config" value="Release" />
-    </target>
+        <property name="build.debug" value="false" />
+    </target>
-    <property name="project.config" value="Release" />
-    <target name="Release" description="">
+    <target name="Debug" description="">
-        <property name="project.config" value="Release" />
+        <property name="project.config" value="Debug" />
-        <property name="build.debug" value="false" />
+        <property name="build.debug" value="true" />
-    </target>
+    </target>
-    <target name="net-1.1" description="Sets framework to .NET 1.1">
+    <target name="net-1.1" description="Sets framework to .NET 1.1">
-        <property name="nant.settings.currentframework" value="net-1.1" />
+        <property name="nant.settings.currentframework" value="net-1.1" />
-    </target>
+    </target>
-    <target name="net-2.0" description="Sets framework to .NET 2.0">
+    <target name="net-2.0" description="Sets framework to .NET 2.0">
-        <property name="nant.settings.currentframework" value="net-2.0" />
+        <property name="nant.settings.currentframework" value="net-2.0" />
-    </target>
+    </target>
-    <target name="mono-2.0" description="Sets framework to mono 2.0">
+    <target name="mono-2.0" description="Sets framework to mono 2.0">
-        <property name="nant.settings.currentframework" value="mono-2.0" />
+        <property name="nant.settings.currentframework" value="mono-2.0" />
-    </target>
+    </target>
-    <target name="mono-1.0" description="Sets framework to mono 1.0">
+    <target name="mono-1.0" description="Sets framework to mono 1.0">
-        <property name="nant.settings.currentframework" value="mono-1.0" />
+        <property name="nant.settings.currentframework" value="mono-1.0" />
-    </target>
+    </target>
-    <target name="init" description="">
+    <target name="init" description="">
-        <call target="${project.config}" />
+        <call target="${project.config}" />
-        <sysinfo />
+        <sysinfo />
-        <echo message="Platform ${sys.os.platform}" />
+        <echo message="Platform ${sys.os.platform}" />
-        <property name="build.dir" value="${bin.dir}/${project.config}" />
+        <property name="build.dir" value="${bin.dir}/${project.config}" />
-    </target>
+    </target>
-    <target name="clean" description="">
+    <target name="clean" description="">
-        <echo message="Deleting all builds from all configurations" />
+        <echo message="Deleting all builds from all configurations" />
-        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${bin.dir}" failonerror="false" />
-        <delete dir="${obj.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
-        <nant buildfile="src/Prebuild.exe.build" target="clean" />
+        <nant buildfile="src/Prebuild.exe.build" target="clean" />
-    </target>
+    </target>
-    <target name="build" depends="init" description="">
+    <target name="build" depends="init" description="">
-        <nant buildfile="src/Prebuild.exe.build" target="build" />
+        <nant buildfile="src/Prebuild.exe.build" target="build" />
-    </target>
+    </target>
-    <target name="build-release" depends="Release, init, build" description="Builds in Release mode" />
+    <target name="build-release" depends="Release, init, build" description="Builds in Release mode" />
-    <target name="build-debug" depends="Debug, init, build" description="Builds in Debug mode" />
+    <target name="build-debug" depends="Debug, init, build" description="Builds in Debug mode" />
-    <target name="package" depends="clean, doc" description="Builds all" />
+    <target name="package" depends="clean, doc" description="Builds all" />
-    <target name="doc" depends="build-release">
+    <target name="doc" depends="build-release">
-        <echo message="Generating all documentation from all builds" />
+        <echo message="Generating all documentation from all builds" />
-        <nant buildfile="src/Prebuild.exe.build" target="doc" />
+        <nant buildfile="src/Prebuild.exe.build" target="doc" />
-    </target>
+    </target>
-</project>
+</project>
diff --git a/Prebuild/src/Prebuild.exe.build b/Prebuild/src/Prebuild.exe.build
index 43f5516..628e7e1 100644
--- a/Prebuild/src/Prebuild.exe.build
+++ b/Prebuild/src/Prebuild.exe.build
@@ -1,80 +1,80 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" ?>
-<project name="Prebuild" default="build">
+<project name="Prebuild" default="build">
-    <target name="build">
+    <target name="build">
-        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
-        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
-        <copy todir="${project::get-base-directory()}/${build.dir}">
+        <copy todir="${project::get-base-directory()}/${build.dir}">
-            <fileset basedir="${project::get-base-directory()}">
+            <fileset basedir="${project::get-base-directory()}">
-            </fileset>
+            </fileset>
-        </copy>
+        </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" >
+            <resources prefix="Prebuild" dynamicprefix="true" >
-                <include name="App.ico" />
+                <include name="App.ico" />
-                <include name="data/prebuild-1.7.xsd" />
+                <include name="data/prebuild-1.7.xsd" />
-            </resources>
+            </resources>
-            <sources failonempty="true">
+            <sources failonempty="true">
-                <include name="Prebuild.cs" />
+                <include name="Prebuild.cs" />
-                <include name="Core/FatalException.cs" />
+                <include name="Core/FatalException.cs" />
-                <include name="Core/Kernel.cs" />
+                <include name="Core/Kernel.cs" />
-                <include name="Core/UnknownLanguageException.cs" />
+                <include name="Core/UnknownLanguageException.cs" />
-                <include name="Core/WarningException.cs" />
+                <include name="Core/WarningException.cs" />
-                <include name="Core/Attributes/DataNodeAttribute.cs" />
+                <include name="Core/Attributes/DataNodeAttribute.cs" />
-                <include name="Core/Attributes/OptionNodeAttribute.cs" />
+                <include name="Core/Attributes/OptionNodeAttribute.cs" />
-                <include name="Core/Attributes/TargetAttribute.cs" />
+                <include name="Core/Attributes/TargetAttribute.cs" />
-                <include name="Core/Interfaces/IDataNode.cs" />
+                <include name="Core/Interfaces/IDataNode.cs" />
-                <include name="Core/Interfaces/ITarget.cs" />
+                <include name="Core/Interfaces/ITarget.cs" />
-                <include name="Core/Nodes/ConfigurationNode.cs" />
+                <include name="Core/Nodes/ConfigurationNode.cs" />
-                <include name="Core/Nodes/DataNode.cs" />
+                <include name="Core/Nodes/DataNode.cs" />
-                <include name="Core/Nodes/ExcludeNode.cs" />
+                <include name="Core/Nodes/ExcludeNode.cs" />
-                <include name="Core/Nodes/FileNode.cs" />
+                <include name="Core/Nodes/FileNode.cs" />
-                <include name="Core/Nodes/FilesNode.cs" />
+                <include name="Core/Nodes/FilesNode.cs" />
-                <include name="Core/Nodes/MatchNode.cs" />
+                <include name="Core/Nodes/MatchNode.cs" />
-                <include name="Core/Nodes/OptionsNode.cs" />
+                <include name="Core/Nodes/OptionsNode.cs" />
-                <include name="Core/Nodes/ProcessNode.cs" />
+                <include name="Core/Nodes/ProcessNode.cs" />
-                <include name="Core/Nodes/ProjectNode.cs" />
+                <include name="Core/Nodes/ProjectNode.cs" />
-                <include name="Core/Nodes/ReferenceNode.cs" />
+                <include name="Core/Nodes/ReferenceNode.cs" />
-                <include name="Core/Nodes/ReferencePathNode.cs" />
+                <include name="Core/Nodes/ReferencePathNode.cs" />
-                <include name="Core/Nodes/SolutionNode.cs" />
+                <include name="Core/Nodes/SolutionNode.cs" />
-                <include name="Core/Parse/IfContext.cs" />
+                <include name="Core/Parse/IfContext.cs" />
-                <include name="Core/Parse/Preprocessor.cs" />
+                <include name="Core/Parse/Preprocessor.cs" />
-                <include name="Core/Targets/AutotoolsTarget.cs" />
+                <include name="Core/Targets/AutotoolsTarget.cs" />
-                <include name="Core/Targets/DebugTarget.cs" />
+                <include name="Core/Targets/DebugTarget.cs" />
-                <include name="Core/Targets/MonoDevelopTarget.cs" />
+                <include name="Core/Targets/MonoDevelopTarget.cs" />
-                <include name="Core/Targets/NAntTarget.cs" />
+                <include name="Core/Targets/NAntTarget.cs" />
-                <include name="Core/Targets/SharpDevelop2Target.cs" />
+                <include name="Core/Targets/SharpDevelop2Target.cs" />
-                <include name="Core/Targets/SharpDevelopTarget.cs" />
+                <include name="Core/Targets/SharpDevelopTarget.cs" />
-                <include name="Core/Targets/VS2002Target.cs" />
+                <include name="Core/Targets/VS2002Target.cs" />
-                <include name="Core/Targets/VS2003Target.cs" />
+                <include name="Core/Targets/VS2003Target.cs" />
-                <include name="Core/Targets/VS2005Target.cs" />
+                <include name="Core/Targets/VS2005Target.cs" />
-                <include name="Core/Utilities/CommandLineCollection.cs" />
+                <include name="Core/Utilities/CommandLineCollection.cs" />
-                <include name="Core/Utilities/CurrentDirectory.cs" />
+                <include name="Core/Utilities/CurrentDirectory.cs" />
-                <include name="Core/Utilities/Helper.cs" />
+                <include name="Core/Utilities/Helper.cs" />
-                <include name="Core/Utilities/Log.cs" />
+                <include name="Core/Utilities/Log.cs" />
-                <include name="Properties/AssemblyInfo.cs" />
+                <include name="Properties/AssemblyInfo.cs" />
-            </sources>
+            </sources>
-            <references basedir="${project::get-base-directory()}">
+            <references basedir="${project::get-base-directory()}">
-                <lib>
+                <lib>
-                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}" />
-                    <include name="${project::get-base-directory()}/${build.dir}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
-                </lib>
+                </lib>
-                <include name="System.EnterpriseServices.dll" />
+                <include name="System.EnterpriseServices.dll" />
-                <include name="System.Xml.dll" />
+                <include name="System.Xml.dll" />
-                <include name="System.dll" />
+                <include name="System.dll" />
-            </references>
+            </references>
-        </csc>
+        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../../bin/"/>
+        <mkdir dir="${project::get-base-directory()}/../../bin/"/>
-        <copy todir="${project::get-base-directory()}/../../bin/">
+        <copy todir="${project::get-base-directory()}/../../bin/">
-            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
-                <include name="*.dll"/>
+                <include name="*.dll"/>
-                <include name="*.exe"/>
+                <include name="*.exe"/>
-            </fileset>
+            </fileset>
-        </copy>
+        </copy>
-    </target>
+    </target>
-    <target name="clean">
+    <target name="clean">
-        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${bin.dir}" failonerror="false" />
-        <delete dir="${obj.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
-    </target>
+    </target>
-    <target name="doc" description="Creates documentation.">
+    <target name="doc" description="Creates documentation.">
-    </target>
+    </target>
-</project>
+</project>
diff --git a/Servers/OpenSim.Servers.dll.build b/Servers/OpenSim.Servers.dll.build
index 1d4b496..74d1072 100644
--- a/Servers/OpenSim.Servers.dll.build
+++ b/Servers/OpenSim.Servers.dll.build
@@ -1,48 +1,48 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" ?>
-<project name="OpenSim.Servers" default="build">
+<project name="OpenSim.Servers" default="build">
-    <target name="build">
+    <target name="build">
-        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
+        <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
-        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
+        <mkdir dir="${project::get-base-directory()}/${build.dir}" />
-        <copy todir="${project::get-base-directory()}/${build.dir}">
+        <copy todir="${project::get-base-directory()}/${build.dir}">
-            <fileset basedir="${project::get-base-directory()}">
+            <fileset basedir="${project::get-base-directory()}">
-            </fileset>
+            </fileset>
-        </copy>
+        </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 prefix="OpenSim.Servers" dynamicprefix="true" >
-            </resources>
+            </resources>
-            <sources failonempty="true">
+            <sources failonempty="true">
-                <include name="BaseHttpServer.cs" />
+                <include name="BaseHttpServer.cs" />
-                <include name="IRestHandler.cs" />
+                <include name="IRestHandler.cs" />
-                <include name="LocalUserProfileManager.cs" />
+                <include name="LocalUserProfileManager.cs" />
-                <include name="LoginResponse.cs" />
+                <include name="LoginResponse.cs" />
-                <include name="LoginServer.cs" />
+                <include name="LoginServer.cs" />
-                <include name="XmlRpcMethod.cs" />
+                <include name="XmlRpcMethod.cs" />
-            </sources>
+            </sources>
-            <references basedir="${project::get-base-directory()}">
+            <references basedir="${project::get-base-directory()}">
-                <lib>
+                <lib>
-                    <include name="${project::get-base-directory()}" />
+                    <include name="${project::get-base-directory()}" />
-                    <include name="${project::get-base-directory()}/${build.dir}" />
+                    <include name="${project::get-base-directory()}/${build.dir}" />
-                </lib>
+                </lib>
-                <include name="System.dll" />
+                <include name="System.dll" />
-                <include name="System.Xml.dll" />
+                <include name="System.Xml.dll" />
-                <include name="../bin/OpenSim.Framework.dll" />
+                <include name="../bin/OpenSim.Framework.dll" />
-                <include name="../bin/OpenSim.Framework.Console.dll" />
+                <include name="../bin/OpenSim.Framework.Console.dll" />
-                <include name="../bin/libsecondlife.dll" />
+                <include name="../bin/libsecondlife.dll" />
-            </references>
+            </references>
-        </csc>
+        </csc>
-        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
+        <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
-        <mkdir dir="${project::get-base-directory()}/../bin/"/>
+        <mkdir dir="${project::get-base-directory()}/../bin/"/>
-        <copy todir="${project::get-base-directory()}/../bin/">
+        <copy todir="${project::get-base-directory()}/../bin/">
-            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
+            <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
-                <include name="*.dll"/>
+                <include name="*.dll"/>
-                <include name="*.exe"/>
+                <include name="*.exe"/>
-            </fileset>
+            </fileset>
-        </copy>
+        </copy>
-    </target>
+    </target>
-    <target name="clean">
+    <target name="clean">
-        <delete dir="${bin.dir}" failonerror="false" />
+        <delete dir="${bin.dir}" failonerror="false" />
-        <delete dir="${obj.dir}" failonerror="false" />
+        <delete dir="${obj.dir}" failonerror="false" />
-    </target>
+    </target>
-    <target name="doc" description="Creates documentation.">
+    <target name="doc" description="Creates documentation.">
-    </target>
+    </target>
-</project>
+</project>
diff --git a/bin/OpenSim.Terrain.BasicTerrain.dll b/bin/OpenSim.Terrain.BasicTerrain.dll
index 089f0c8..729a93f 100644
--- a/bin/OpenSim.Terrain.BasicTerrain.dll
+++ b/bin/OpenSim.Terrain.BasicTerrain.dll
Binary files differ
diff --git a/prebuild.xml b/prebuild.xml
index b0ea3be..659a298 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -516,7 +516,7 @@
      <Reference name="System.Xml"/>
      <Reference name="System.Data"/>
      <Reference name="Kds.Serialization.dll"/>
-      <Reference name="libDB_dotNET43.dll"/>
+      <Reference name="libdb_dotNET43.dll"/>
      <Reference name="libsecondlife.dll"/>
      <Reference name="OpenSim.Framework"/>
      <Reference name="OpenSim.Framework.Console"/>
@@ -525,7 +525,6 @@
      </Files>
    </Project>
    
-    
  </Solution>