aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Framework/General/RegionCommsListener.cs1
-rw-r--r--OpenSim/Framework/General/Types/RegionInfo.cs4
-rw-r--r--OpenSim/Framework/General/UserProfile.cs2
-rw-r--r--OpenSim/Framework/UserManager/LoginResponse.cs3
-rw-r--r--OpenSim/Framework/UserManager/UserManagerBase.cs1
-rw-r--r--OpenSim/Region/Communications/Local/LocalBackEndServices.cs1
-rw-r--r--OpenSim/Region/Communications/Local/LocalUserServices.cs2
7 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Framework/General/RegionCommsListener.cs b/OpenSim/Framework/General/RegionCommsListener.cs
index bba928f..5fa2f58 100644
--- a/OpenSim/Framework/General/RegionCommsListener.cs
+++ b/OpenSim/Framework/General/RegionCommsListener.cs
@@ -49,6 +49,7 @@ namespace OpenSim.Framework
49 { 49 {
50 if(OnExpectUser != null) 50 if(OnExpectUser != null)
51 { 51 {
52
52 OnExpectUser(regionHandle, agent); 53 OnExpectUser(regionHandle, agent);
53 return true; 54 return true;
54 } 55 }
diff --git a/OpenSim/Framework/General/Types/RegionInfo.cs b/OpenSim/Framework/General/Types/RegionInfo.cs
index 48e6922..0fba6ca 100644
--- a/OpenSim/Framework/General/Types/RegionInfo.cs
+++ b/OpenSim/Framework/General/Types/RegionInfo.cs
@@ -110,7 +110,7 @@ namespace OpenSim.Framework.Types
110 attri = configData.GetAttribute("SimLocationX"); 110 attri = configData.GetAttribute("SimLocationX");
111 if (attri == "") 111 if (attri == "")
112 { 112 {
113 string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location X", "997"); 113 string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location X", "1000");
114 configData.SetAttribute("SimLocationX", location); 114 configData.SetAttribute("SimLocationX", location);
115 this.RegionLocX = (uint)Convert.ToUInt32(location); 115 this.RegionLocX = (uint)Convert.ToUInt32(location);
116 } 116 }
@@ -123,7 +123,7 @@ namespace OpenSim.Framework.Types
123 attri = configData.GetAttribute("SimLocationY"); 123 attri = configData.GetAttribute("SimLocationY");
124 if (attri == "") 124 if (attri == "")
125 { 125 {
126 string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location Y", "996"); 126 string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location Y", "1000");
127 configData.SetAttribute("SimLocationY", location); 127 configData.SetAttribute("SimLocationY", location);
128 this.RegionLocY = (uint)Convert.ToUInt32(location); 128 this.RegionLocY = (uint)Convert.ToUInt32(location);
129 } 129 }
diff --git a/OpenSim/Framework/General/UserProfile.cs b/OpenSim/Framework/General/UserProfile.cs
index 04ff20b..263dba2 100644
--- a/OpenSim/Framework/General/UserProfile.cs
+++ b/OpenSim/Framework/General/UserProfile.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Framework.User
59 { 59 {
60 Circuits = new Dictionary<LLUUID, uint>(); 60 Circuits = new Dictionary<LLUUID, uint>();
61 Inventory = new AgentInventory(); 61 Inventory = new AgentInventory();
62 homeregionhandle = Helpers.UIntsToLong((997 * 256), (996 * 256)); 62 homeregionhandle = Helpers.UIntsToLong((1000 * 256), (1000 * 256));
63 homepos = new LLVector3(); 63 homepos = new LLVector3();
64 homelookat = new LLVector3(); 64 homelookat = new LLVector3();
65 } 65 }
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 }
diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
index ae47890..26834be 100644
--- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
@@ -182,7 +182,6 @@ namespace OpenSim.Region.Communications.Local
182 /// <returns></returns> 182 /// <returns></returns>
183 public bool AddNewSession(ulong regionHandle, Login loginData) 183 public bool AddNewSession(ulong regionHandle, Login loginData)
184 { 184 {
185 //Console.WriteLine(" comms manager been told to expect new user");
186 AgentCircuitData agent = new AgentCircuitData(); 185 AgentCircuitData agent = new AgentCircuitData();
187 agent.AgentID = loginData.Agent; 186 agent.AgentID = loginData.Agent;
188 agent.firstname = loginData.First; 187 agent.firstname = loginData.First;
diff --git a/OpenSim/Region/Communications/Local/LocalUserServices.cs b/OpenSim/Region/Communications/Local/LocalUserServices.cs
index 508a3f9..6cf254b 100644
--- a/OpenSim/Region/Communications/Local/LocalUserServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalUserServices.cs
@@ -88,7 +88,7 @@ namespace OpenSim.Region.Communications.Local
88 "'position':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "], " + 88 "'position':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "], " +
89 "'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}"; 89 "'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}";
90 string capsPath = Util.GetRandomCapsPath(); 90 string capsPath = Util.GetRandomCapsPath();
91 response.SimAddress = reg.CommsIPListenAddr; 91 response.SimAddress = reg.CommsExternalAddress;
92 response.SimPort = (Int32)reg.CommsIPListenPort; 92 response.SimPort = (Int32)reg.CommsIPListenPort;
93 response.RegionX = reg.RegionLocX ; 93 response.RegionX = reg.RegionLocX ;
94 response.RegionY = reg.RegionLocY ; 94 response.RegionY = reg.RegionLocY ;