aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/UserManager
diff options
context:
space:
mode:
authormingchen2007-06-29 01:58:16 +0000
committermingchen2007-06-29 01:58:16 +0000
commit90b01ba80ccaa69bf7cf76be6ce0a6ca05717d6c (patch)
tree7428eccc93a3f64f46e08d7269bc337f3d26d8a8 /OpenSim/Framework/UserManager
parent* Removed J# language support because it has issues with Mono. (diff)
downloadopensim-SC-90b01ba80ccaa69bf7cf76be6ce0a6ca05717d6c.zip
opensim-SC-90b01ba80ccaa69bf7cf76be6ce0a6ca05717d6c.tar.gz
opensim-SC-90b01ba80ccaa69bf7cf76be6ce0a6ca05717d6c.tar.bz2
opensim-SC-90b01ba80ccaa69bf7cf76be6ce0a6ca05717d6c.tar.xz
*Hopefully fixed the empty dialog box error on client when logging in on sandbox mode
Diffstat (limited to 'OpenSim/Framework/UserManager')
-rw-r--r--OpenSim/Framework/UserManager/LoginResponse.cs3
-rw-r--r--OpenSim/Framework/UserManager/UserManagerBase.cs1
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/UserManager/LoginResponse.cs b/OpenSim/Framework/UserManager/LoginResponse.cs
index 5ca223f..d1cd8cf 100644
--- a/OpenSim/Framework/UserManager/LoginResponse.cs
+++ b/OpenSim/Framework/UserManager/LoginResponse.cs
@@ -124,7 +124,7 @@ namespace OpenSim.Framework.UserManagement
124 this.ErrorReason = "key"; 124 this.ErrorReason = "key";
125 this.welcomeMessage = "Welcome to OpenSim!"; 125 this.welcomeMessage = "Welcome to OpenSim!";
126 this.seedCapability = ""; 126 this.seedCapability = "";
127 this.home = "{'region_handle':[r" + (997 * 256).ToString() + ",r" + (996 * 256).ToString() + "], 'position':[r" + this.userProfile.homepos.X.ToString() + ",r" + this.userProfile.homepos.Y.ToString() + ",r" + this.userProfile.homepos.Z.ToString() + "], 'look_at':[r" + this.userProfile.homelookat.X.ToString() + ",r" + this.userProfile.homelookat.Y.ToString() + ",r" + this.userProfile.homelookat.Z.ToString() + "]}"; 127 this.home = "{'region_handle':[r" + (1000 * 256).ToString() + ",r" + (1000 * 256).ToString() + "], 'position':[r" + this.userProfile.homepos.X.ToString() + ",r" + this.userProfile.homepos.Y.ToString() + ",r" + this.userProfile.homepos.Z.ToString() + "], 'look_at':[r" + this.userProfile.homelookat.X.ToString() + ",r" + this.userProfile.homelookat.Y.ToString() + ",r" + this.userProfile.homelookat.Z.ToString() + "]}";
128 this.lookAt = "[r0.99949799999999999756,r0.03166859999999999814,r0]"; 128 this.lookAt = "[r0.99949799999999999756,r0.03166859999999999814,r0]";
129 this.RegionX = (uint)255232; 129 this.RegionX = (uint)255232;
130 this.RegionY = (uint)254976; 130 this.RegionY = (uint)254976;
@@ -227,6 +227,7 @@ namespace OpenSim.Framework.UserManagement
227 227
228 responseData["sim_port"] =(Int32) this.SimPort; 228 responseData["sim_port"] =(Int32) this.SimPort;
229 responseData["sim_ip"] = this.SimAddress; 229 responseData["sim_ip"] = this.SimAddress;
230 Console.MainLog.Instance.Warn("SIM IP: " + responseData["sim_ip"] + "; SIM PORT: " + responseData["sim_port"]);
230 responseData["agent_id"] = this.AgentID.ToStringHyphenated(); 231 responseData["agent_id"] = this.AgentID.ToStringHyphenated();
231 responseData["session_id"] = this.SessionID.ToStringHyphenated(); 232 responseData["session_id"] = this.SessionID.ToStringHyphenated();
232 responseData["secure_session_id"] = this.SecureSessionID.ToStringHyphenated(); 233 responseData["secure_session_id"] = this.SecureSessionID.ToStringHyphenated();
diff --git a/OpenSim/Framework/UserManager/UserManagerBase.cs b/OpenSim/Framework/UserManager/UserManagerBase.cs
index bc35164..d06059e 100644
--- a/OpenSim/Framework/UserManager/UserManagerBase.cs
+++ b/OpenSim/Framework/UserManager/UserManagerBase.cs
@@ -472,7 +472,6 @@ namespace OpenSim.Framework.UserManagement
472 return logResponse.CreateDeadRegionResponse(); 472 return logResponse.CreateDeadRegionResponse();
473 } 473 }
474 CommitAgent(ref TheUser); 474 CommitAgent(ref TheUser);
475
476 return logResponse.ToXmlRpcResponse(); 475 return logResponse.ToXmlRpcResponse();
477 476
478 } 477 }