Added POST handler for /sims/ in the grid server

Removed asset/user config in grid mode in the region server
Added "create user" command in the user server console
Begun buggy code to send sim details to the grid at startup
Drank whole pack of red bull in one night and made stupid jokes in SVN logs and C# comments

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

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

OpenGridServices.GridServer/GridHttp.cs

@@ -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")) {
-							XmlRpcResponse ErrorResp = new XmlRpcResponse();
-							Hashtable ErrorRespData = new Hashtable();
-							ErrorRespData["error"]="Only simulators can login with this method";
-							ErrorResp.Value=ErrorRespData;
-							return(Regex.Replace(XmlRpcResponseSerializer.Singleton.Serialize(ErrorResp),"utf-16","utf-8"));
-						}
 					
-						if(!((string)requestData["authkey"]==OpenGrid_Main.thegrid.SimRecvKey)) {
+						/*if(!((string)requestData["authkey"]==OpenGrid_Main.thegrid.SimRecvKey)) {
 							XmlRpcResponse ErrorResp = new XmlRpcResponse();
 							Hashtable ErrorRespData = new Hashtable();
 							ErrorRespData["error"]="invalid key";
 							ErrorResp.Value=ErrorRespData;
 							return(Regex.Replace(XmlRpcResponseSerializer.Singleton.Serialize(ErrorResp),"utf-16","utf-8"));
+						}*/
+						SimProfileBase TheSim = null;
+
+						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"]="sim not found";
+							ErrorResp.Value=ErrorRespData;
+							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();
 						
@@ -116,6 +124,7 @@ namespace OpenGridServices.GridServer
 							}
 						}
 
+						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 "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;
 			}
 	

OpenGridServices.GridServer/OpenGridServices.GridServer.exe.build

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

OpenGridServices.UserServer/Main.cs

@@ -99,16 +99,12 @@ namespace OpenGridServices.UserServer
 			_httpd = new UserHTTPServer();
 		}
 
-        public void RunCmd(string cmd, string[] cmdparams)
-        {
-            switch (cmd)
-            {
-                case "help":
-                    m_console.WriteLine("create user - create a new user");
-		    m_console.WriteLine("shutdown - shutdown the grid (USE CAUTION!)");
-                    break;
 
-                case "create user":
+	public void do_create(string what)
+	{
+		switch(what)
+		{
+			case "user":
 			    m_console.WriteLine("Creating new user profile");
 			    string tempfirstname;
 			    string templastname;
@@ -126,13 +122,28 @@ namespace OpenGridServices.UserServer
 			    {
 	 			s.Append(b.ToString("x2").ToLower());
 			    }
-		    tempMD5Passwd = "$1$" + s.ToString();
+			    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)
+            {
+                case "help":
+                    m_console.WriteLine("create user - create a new user");
+		    m_console.WriteLine("shutdown - shutdown the grid (USE CAUTION!)");
+                    break;
+
+                case "create":
+			do_create(cmdparams[0]);
+		break;
 
 		case "shutdown":
                     m_console.Close();

OpenGridServices.UserServer/OpenGridServices.UserServer.exe.build

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

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

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

OpenSim.Framework/OpenSim.Framework.dll.build

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

OpenSim.Framework/SimProfile.cs

@@ -16,11 +16,10 @@ namespace OpenSim.Framework.Sims
             {
                 Hashtable GridReqParams = new Hashtable();
                 GridReqParams["region_handle"] = region_handle.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);
 
@@ -43,6 +42,40 @@ namespace OpenSim.Framework.Sims
             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("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()
         {
         }

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);
 
 
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

OpenSim.RegionServer/OpenSim.RegionServer.dll.build

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

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
 
 

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;
@@ -36,6 +39,36 @@ namespace OpenSim
 
         }
 
+	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)
         {
             this.isSandbox = sandboxMode;
@@ -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");
@@ -182,44 +193,11 @@ namespace OpenSim
                     {
                         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)

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

@@ -7,7 +7,7 @@
             <fileset basedir="${project::get-base-directory()}">
             </fileset>
         </copy>
-        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
+        <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
             <resources prefix="OpenSim.Storage.LocalStorageBerkeleyDB" dynamicprefix="true" >
             </resources>
             <sources failonempty="true">
@@ -23,7 +23,7 @@
                 <include name="System.Xml.dll" />
                 <include name="System.Data.dll" />
                 <include name="../bin/Kds.Serialization.dll" />
-                <include name="../bin/libDB_dotNET43.dll" />
+                <include name="../bin/libdb_dotNET43.dll" />
                 <include name="../bin/libsecondlife.dll" />
                 <include name="../bin/OpenSim.Framework.dll" />
                 <include name="../bin/OpenSim.Framework.Console.dll" />

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

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

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

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

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

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

OpenSim.build

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

OpenSim/OpenSim.exe.build

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

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

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

Prebuild/Prebuild.build

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

Prebuild/src/Prebuild.exe.build

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

Servers/OpenSim.Servers.dll.build

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

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>