diff options
Diffstat (limited to '')
| -rw-r--r-- | OpenSim.Framework/SimProfile.cs | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/OpenSim.Framework/SimProfile.cs b/OpenSim.Framework/SimProfile.cs index fd130f0..ed34863 100644 --- a/OpenSim.Framework/SimProfile.cs +++ b/OpenSim.Framework/SimProfile.cs | |||
| @@ -25,15 +25,15 @@ namespace OpenSim.Framework.Sims | |||
| 25 | 25 | ||
| 26 | Hashtable RespData = (Hashtable)GridResp.Value; | 26 | Hashtable RespData = (Hashtable)GridResp.Value; |
| 27 | this.UUID = new LLUUID((string)RespData["UUID"]); | 27 | this.UUID = new LLUUID((string)RespData["UUID"]); |
| 28 | this.regionhandle = (ulong)Convert.ToUInt64(RespData["regionhandle"]); | 28 | this.regionhandle = Helpers.UIntsToLong((997 * 256), (996 * 256)); |
| 29 | this.regionname = (string)RespData["regionname"]; | 29 | this.regionname = (string)RespData["regionname"]; |
| 30 | this.sim_ip = (string)RespData["sim_ip"]; | 30 | this.sim_ip = (string)RespData["sim_ip"]; |
| 31 | this.sim_port = (uint)Convert.ToUInt16(RespData["sim_port"]); | 31 | this.sim_port = (uint)Convert.ToUInt16(RespData["sim_port"]); |
| 32 | this.caps_url = (string)RespData["caps_url"]; | 32 | this.caps_url = "http://" + ((string)RespData["sim_ip"]) + ":" + (string)RespData["sim_port"] + "/"; |
| 33 | this.RegionLocX = (uint)Convert.ToUInt32(RespData["RegionLocX"]); | 33 | this.RegionLocX = (uint)Convert.ToUInt32(RespData["region_locx"]); |
| 34 | this.RegionLocY = (uint)Convert.ToUInt32(RespData["RegionLocY"]); | 34 | this.RegionLocY = (uint)Convert.ToUInt32(RespData["region_locy"]); |
| 35 | this.sendkey = (string)RespData["sendkey"]; | 35 | this.sendkey = SendKey; |
| 36 | this.recvkey = (string)RespData["recvkey"]; | 36 | this.recvkey = RecvKey; |
| 37 | } | 37 | } |
| 38 | catch (Exception e) | 38 | catch (Exception e) |
| 39 | { | 39 | { |
| @@ -48,7 +48,6 @@ namespace OpenSim.Framework.Sims | |||
| 48 | { | 48 | { |
| 49 | Hashtable GridReqParams = new Hashtable(); | 49 | Hashtable GridReqParams = new Hashtable(); |
| 50 | GridReqParams["UUID"] = UUID.ToString(); | 50 | GridReqParams["UUID"] = UUID.ToString(); |
| 51 | GridReqParams["caller"] = "userserver"; | ||
| 52 | GridReqParams["authkey"] = SendKey; | 51 | GridReqParams["authkey"] = SendKey; |
| 53 | ArrayList SendParams = new ArrayList(); | 52 | ArrayList SendParams = new ArrayList(); |
| 54 | SendParams.Add(GridReqParams); | 53 | SendParams.Add(GridReqParams); |
| @@ -58,15 +57,15 @@ namespace OpenSim.Framework.Sims | |||
| 58 | 57 | ||
| 59 | Hashtable RespData = (Hashtable)GridResp.Value; | 58 | Hashtable RespData = (Hashtable)GridResp.Value; |
| 60 | this.UUID = new LLUUID((string)RespData["UUID"]); | 59 | this.UUID = new LLUUID((string)RespData["UUID"]); |
| 61 | this.regionhandle = (ulong)Convert.ToUInt64(RespData["regionhandle"]); | 60 | this.regionhandle = Helpers.UIntsToLong((997 * 256), (996 * 256)); |
| 62 | this.regionname = (string)RespData["regionname"]; | 61 | this.regionname = (string)RespData["regionname"]; |
| 63 | this.sim_ip = (string)RespData["sim_ip"]; | 62 | this.sim_ip = (string)RespData["sim_ip"]; |
| 64 | this.sim_port = (uint)Convert.ToUInt16(RespData["sim_port"]); | 63 | this.sim_port = (uint)Convert.ToUInt16(RespData["sim_port"]); |
| 65 | this.caps_url = (string)RespData["caps_url"]; | 64 | this.caps_url = "http://" + ((string)RespData["sim_ip"]) + ":" + (string)RespData["sim_port"] + "/"; |
| 66 | this.RegionLocX = (uint)Convert.ToUInt32(RespData["RegionLocX"]); | 65 | this.RegionLocX = (uint)Convert.ToUInt32(RespData["region_locx"]); |
| 67 | this.RegionLocY = (uint)Convert.ToUInt32(RespData["RegionLocY"]); | 66 | this.RegionLocY = (uint)Convert.ToUInt32(RespData["region_locy"]); |
| 68 | this.sendkey = (string)RespData["sendkey"]; | 67 | this.sendkey = SendKey; |
| 69 | this.recvkey = (string)RespData["recvkey"]; | 68 | this.recvkey = RecvKey; |
| 70 | } | 69 | } |
| 71 | catch (Exception e) | 70 | catch (Exception e) |
| 72 | { | 71 | { |