aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.Framework
diff options
context:
space:
mode:
authorgareth2007-04-17 01:38:20 +0000
committergareth2007-04-17 01:38:20 +0000
commitbbcb20e192b61a63e0b0462de794ccbdb54d886b (patch)
tree37f05557c0f5e04849f4b0ff94752563e967220d /OpenSim.Framework
parentStarted to fix sandbox mode (diff)
downloadopensim-SC_OLD-bbcb20e192b61a63e0b0462de794ccbdb54d886b.zip
opensim-SC_OLD-bbcb20e192b61a63e0b0462de794ccbdb54d886b.tar.gz
opensim-SC_OLD-bbcb20e192b61a63e0b0462de794ccbdb54d886b.tar.bz2
opensim-SC_OLD-bbcb20e192b61a63e0b0462de794ccbdb54d886b.tar.xz
Sim crossing now works (except for broken co-ordinates, resets to 0,0 - to be fixed soon)
Fixed sandbox mode fully Scrapped former XML-RPC expect_user call for sim crossings Sim client thread can upgrade/downgrade between full and child agent dynamically
Diffstat (limited to '')
-rw-r--r--OpenSim.Framework/AgentCiruitData.cs1
-rw-r--r--OpenSim.Framework/SimProfile.cs4
-rw-r--r--OpenSim.Framework/UserProfileManager.cs5
3 files changed, 7 insertions, 3 deletions
diff --git a/OpenSim.Framework/AgentCiruitData.cs b/OpenSim.Framework/AgentCiruitData.cs
index 461d962..e1a79b9 100644
--- a/OpenSim.Framework/AgentCiruitData.cs
+++ b/OpenSim.Framework/AgentCiruitData.cs
@@ -11,6 +11,7 @@ namespace OpenSim.Framework.Interfaces
11 public LLUUID AgentID; 11 public LLUUID AgentID;
12 public LLUUID SessionID; 12 public LLUUID SessionID;
13 public LLUUID SecureSessionID; 13 public LLUUID SecureSessionID;
14 public LLVector3 startpos;
14 public string firstname; 15 public string firstname;
15 public string lastname; 16 public string lastname;
16 public uint circuitcode; 17 public uint circuitcode;
diff --git a/OpenSim.Framework/SimProfile.cs b/OpenSim.Framework/SimProfile.cs
index ed34863..ad3e028 100644
--- a/OpenSim.Framework/SimProfile.cs
+++ b/OpenSim.Framework/SimProfile.cs
@@ -25,7 +25,7 @@ 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 = Helpers.UIntsToLong((997 * 256), (996 * 256)); 28 this.regionhandle = Helpers.UIntsToLong(((uint)Convert.ToUInt32(RespData["region_locx"]) * 256), ((uint)Convert.ToUInt32(RespData["region_locy"]) * 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"]);
@@ -57,7 +57,7 @@ namespace OpenSim.Framework.Sims
57 57
58 Hashtable RespData = (Hashtable)GridResp.Value; 58 Hashtable RespData = (Hashtable)GridResp.Value;
59 this.UUID = new LLUUID((string)RespData["UUID"]); 59 this.UUID = new LLUUID((string)RespData["UUID"]);
60 this.regionhandle = Helpers.UIntsToLong((997 * 256), (996 * 256)); 60 this.regionhandle = Helpers.UIntsToLong(((uint)Convert.ToUInt32(RespData["region_locx"]) * 256), ((uint)Convert.ToUInt32(RespData["region_locy"]) * 256));
61 this.regionname = (string)RespData["regionname"]; 61 this.regionname = (string)RespData["regionname"];
62 this.sim_ip = (string)RespData["sim_ip"]; 62 this.sim_ip = (string)RespData["sim_ip"];
63 this.sim_port = (uint)Convert.ToUInt16(RespData["sim_port"]); 63 this.sim_port = (uint)Convert.ToUInt16(RespData["sim_port"]);
diff --git a/OpenSim.Framework/UserProfileManager.cs b/OpenSim.Framework/UserProfileManager.cs
index a44342c..33f2abd 100644
--- a/OpenSim.Framework/UserProfileManager.cs
+++ b/OpenSim.Framework/UserProfileManager.cs
@@ -258,7 +258,10 @@ namespace OpenSim.Framework.User
258 SimParams["firstname"] = theUser.firstname; 258 SimParams["firstname"] = theUser.firstname;
259 SimParams["lastname"] = theUser.lastname; 259 SimParams["lastname"] = theUser.lastname;
260 SimParams["agent_id"] = theUser.UUID.ToString(); 260 SimParams["agent_id"] = theUser.UUID.ToString();
261 SimParams["circuit_code"] = (Int32)circode; 261 SimParams["circuit_code"] = (Int32)circode;
262 SimParams["startpos_x"] = theUser.homepos.X.ToString();
263 SimParams["startpos_y"] = theUser.homepos.Y.ToString();
264 SimParams["startpos_z"] = theUser.homepos.Z.ToString();
262 ArrayList SendParams = new ArrayList(); 265 ArrayList SendParams = new ArrayList();
263 SendParams.Add(SimParams); 266 SendParams.Add(SimParams);
264 267