Fixed weird XML/HTTP bugs

Can now update a sim profile at startup automatically! W00t!
Untested neighbours code (for sim crossings)
Didn't drink any red bull today :( Used liquid guarana extract + cola

2 files changed, 9 insertions, 3 deletions

diff --git a/OpenSim.RegionServer/RegionInfo.cs b/OpenSim.RegionServer/RegionInfo.cs
index 9958f1a..abc674f 100644
--- a/OpenSim.RegionServer/RegionInfo.cs
+++ b/OpenSim.RegionServer/RegionInfo.cs
@@ -44,7 +44,8 @@ namespace OpenSim
             //we really want to keep any server connection code out of here and out of the code code

             // and put it in the server connection classes (those inheriting from IGridServer etc)

             string reqtext;

-            reqtext = "<authkey>" + this.GridSendKey + "</authkey>";

+            reqtext = "<Root>";
+            reqtext += "<authkey>" + this.GridSendKey + "</authkey>";

             reqtext += "<sim>";

             reqtext += "<uuid>" + this.SimUUID.ToString() + "</uuid>";

             reqtext += "<regionname>" + this.RegionName + "</regionname>";

@@ -54,6 +55,7 @@ namespace OpenSim
             reqtext += "<region_locy>" + this.RegionLocY.ToString() + "</region_locy>";

             reqtext += "<estate_id>1</estate_id>";

             reqtext += "</sim>";

+            reqtext += "</Root>";
 
             byte[] reqdata = (new System.Text.ASCIIEncoding()).GetBytes(reqtext);
 

@@ -67,7 +69,7 @@ namespace OpenSim
             stOut.Close();

 

             WebResponse gridresp = GridSaveReq.GetResponse();
-            StreamReader stIn = new StreamReader(gridresp.GetResponseStream());

+            StreamReader stIn = new StreamReader(gridresp.GetResponseStream(), Encoding.ASCII);

             string GridResponse = stIn.ReadToEnd();

             stIn.Close();

             gridresp.Close();
diff --git a/OpenSim.Servers/BaseHttpServer.cs b/OpenSim.Servers/BaseHttpServer.cs
index 0a123b7..bb8f0ad 100644
--- a/OpenSim.Servers/BaseHttpServer.cs
+++ b/OpenSim.Servers/BaseHttpServer.cs
@@ -154,6 +154,7 @@ namespace OpenSim.Servers
 

         public virtual void HandleRequest(Object stateinfo)

         {

+        try {
             HttpListenerContext context = (HttpListenerContext)stateinfo;

 

             HttpListenerRequest request = context.Request;

@@ -210,7 +211,10 @@ namespace OpenSim.Servers
             response.SendChunked = false;

             response.ContentLength64 = buffer.Length;

             output.Write(buffer, 0, buffer.Length);

-            output.Close();

+            output.Close();
+        } catch (Exception e) {
+                Console.WriteLine(e.ToString());
+        }

         }

 

         public void Start()