diff options
author | MW | 2007-04-17 12:03:52 +0000 |
---|---|---|
committer | MW | 2007-04-17 12:03:52 +0000 |
commit | d5406fe77309770234524f6afa38ae1502f01eab (patch) | |
tree | 1eacbc4c4f803087b7a2df77c43e8de65d91dbf2 /OpenSim.RegionServer/RegionInfo.cs | |
parent | Created skeleton SimComms.cs for sim<->sim UDP circuits (diff) | |
download | opensim-SC-d5406fe77309770234524f6afa38ae1502f01eab.zip opensim-SC-d5406fe77309770234524f6afa38ae1502f01eab.tar.gz opensim-SC-d5406fe77309770234524f6afa38ae1502f01eab.tar.bz2 opensim-SC-d5406fe77309770234524f6afa38ae1502f01eab.tar.xz |
A few fixes and stopped sim crossing being attempted in sandbox mode
Diffstat (limited to '')
-rw-r--r-- | OpenSim.RegionServer/RegionInfo.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim.RegionServer/RegionInfo.cs b/OpenSim.RegionServer/RegionInfo.cs index abc674f..0d5e980 100644 --- a/OpenSim.RegionServer/RegionInfo.cs +++ b/OpenSim.RegionServer/RegionInfo.cs | |||
@@ -44,7 +44,7 @@ namespace OpenSim | |||
44 | //we really want to keep any server connection code out of here and out of the code code | 44 | //we really want to keep any server connection code out of here and out of the code code |
45 | // and put it in the server connection classes (those inheriting from IGridServer etc) | 45 | // and put it in the server connection classes (those inheriting from IGridServer etc) |
46 | string reqtext; | 46 | string reqtext; |
47 | reqtext = "<Root>"; | 47 | reqtext = "<Root>"; |
48 | reqtext += "<authkey>" + this.GridSendKey + "</authkey>"; | 48 | reqtext += "<authkey>" + this.GridSendKey + "</authkey>"; |
49 | reqtext += "<sim>"; | 49 | reqtext += "<sim>"; |
50 | reqtext += "<uuid>" + this.SimUUID.ToString() + "</uuid>"; | 50 | reqtext += "<uuid>" + this.SimUUID.ToString() + "</uuid>"; |
@@ -55,9 +55,9 @@ namespace OpenSim | |||
55 | reqtext += "<region_locy>" + this.RegionLocY.ToString() + "</region_locy>"; | 55 | reqtext += "<region_locy>" + this.RegionLocY.ToString() + "</region_locy>"; |
56 | reqtext += "<estate_id>1</estate_id>"; | 56 | reqtext += "<estate_id>1</estate_id>"; |
57 | reqtext += "</sim>"; | 57 | reqtext += "</sim>"; |
58 | reqtext += "</Root>"; | 58 | reqtext += "</Root>"; |
59 | 59 | ||
60 | byte[] reqdata = (new System.Text.ASCIIEncoding()).GetBytes(reqtext); | 60 | byte[] reqdata = (new System.Text.ASCIIEncoding()).GetBytes(reqtext); |
61 | 61 | ||
62 | WebRequest GridSaveReq = WebRequest.Create(this.GridURL + "sims/" + this.SimUUID.ToString()); | 62 | WebRequest GridSaveReq = WebRequest.Create(this.GridURL + "sims/" + this.SimUUID.ToString()); |
63 | GridSaveReq.Method = "POST"; | 63 | GridSaveReq.Method = "POST"; |
@@ -68,11 +68,11 @@ namespace OpenSim | |||
68 | stOut.Write(reqdata,0,reqdata.Length); | 68 | stOut.Write(reqdata,0,reqdata.Length); |
69 | stOut.Close(); | 69 | stOut.Close(); |
70 | 70 | ||
71 | WebResponse gridresp = GridSaveReq.GetResponse(); | 71 | WebResponse gridresp = GridSaveReq.GetResponse(); |
72 | StreamReader stIn = new StreamReader(gridresp.GetResponseStream(), Encoding.ASCII); | 72 | StreamReader stIn = new StreamReader(gridresp.GetResponseStream(), Encoding.ASCII); |
73 | string GridResponse = stIn.ReadToEnd(); | 73 | string GridResponse = stIn.ReadToEnd(); |
74 | stIn.Close(); | 74 | stIn.Close(); |
75 | gridresp.Close(); | 75 | gridresp.Close(); |
76 | 76 | ||
77 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("RegionInfo.CS:SaveToGrid() - Grid said: " + GridResponse); | 77 | OpenSim.Framework.Console.MainConsole.Instance.WriteLine("RegionInfo.CS:SaveToGrid() - Grid said: " + GridResponse); |
78 | } | 78 | } |