OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

*Hopefully fixed the empty dialog box error on client when logging in on sandbox mode

Sugilite
mingchen 2007-06-29 01:58:16 +00:00
parent 135e9b1f53
commit 90b01ba80c
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Framework/General/RegionCommsListener.cs
View File

@ -49,6 +49,7 @@ namespace OpenSim.Framework
{ {
if(OnExpectUser != null) if(OnExpectUser != null)
{ {
OnExpectUser(regionHandle, agent); OnExpectUser(regionHandle, agent);
return true; return true;
} }

4
OpenSim/Framework/General/Types/RegionInfo.cs
View File

@ -110,7 +110,7 @@ namespace OpenSim.Framework.Types
attri = configData.GetAttribute("SimLocationX"); attri = configData.GetAttribute("SimLocationX");
if (attri == "") if (attri == "")
{ {
string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location X", "997"); string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location X", "1000");
configData.SetAttribute("SimLocationX", location); configData.SetAttribute("SimLocationX", location);
this.RegionLocX = (uint)Convert.ToUInt32(location); this.RegionLocX = (uint)Convert.ToUInt32(location);
} }
@ -123,7 +123,7 @@ namespace OpenSim.Framework.Types
attri = configData.GetAttribute("SimLocationY"); attri = configData.GetAttribute("SimLocationY");
if (attri == "") if (attri == "")
{ {
string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location Y", "996"); string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location Y", "1000");
configData.SetAttribute("SimLocationY", location); configData.SetAttribute("SimLocationY", location);
this.RegionLocY = (uint)Convert.ToUInt32(location); this.RegionLocY = (uint)Convert.ToUInt32(location);
} }

2
OpenSim/Framework/General/UserProfile.cs
View File

@ -59,7 +59,7 @@ namespace OpenSim.Framework.User
{ {
Circuits = new Dictionary<LLUUID, uint>(); Circuits = new Dictionary<LLUUID, uint>();
Inventory = new AgentInventory(); Inventory = new AgentInventory();
homeregionhandle = Helpers.UIntsToLong((997 * 256), (996 * 256)); homeregionhandle = Helpers.UIntsToLong((1000 * 256), (1000 * 256));
homepos = new LLVector3(); homepos = new LLVector3();
homelookat = new LLVector3(); homelookat = new LLVector3();
} }

3
OpenSim/Framework/UserManager/LoginResponse.cs
View File

@ -124,7 +124,7 @@ namespace OpenSim.Framework.UserManagement
this.ErrorReason = "key"; this.ErrorReason = "key";
this.welcomeMessage = "Welcome to OpenSim!"; this.welcomeMessage = "Welcome to OpenSim!";
this.seedCapability = ""; this.seedCapability = "";
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() + "]}"; 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() + "]}";
this.lookAt = "[r0.99949799999999999756,r0.03166859999999999814,r0]"; this.lookAt = "[r0.99949799999999999756,r0.03166859999999999814,r0]";
this.RegionX = (uint)255232; this.RegionX = (uint)255232;
this.RegionY = (uint)254976; this.RegionY = (uint)254976;
@ -227,6 +227,7 @@ namespace OpenSim.Framework.UserManagement
responseData["sim_port"] =(Int32) this.SimPort; responseData["sim_port"] =(Int32) this.SimPort;
responseData["sim_ip"] = this.SimAddress; responseData["sim_ip"] = this.SimAddress;
Console.MainLog.Instance.Warn("SIM IP: " + responseData["sim_ip"] + "; SIM PORT: " + responseData["sim_port"]);
responseData["agent_id"] = this.AgentID.ToStringHyphenated(); responseData["agent_id"] = this.AgentID.ToStringHyphenated();
responseData["session_id"] = this.SessionID.ToStringHyphenated(); responseData["session_id"] = this.SessionID.ToStringHyphenated();
responseData["secure_session_id"] = this.SecureSessionID.ToStringHyphenated(); responseData["secure_session_id"] = this.SecureSessionID.ToStringHyphenated();

1
OpenSim/Framework/UserManager/UserManagerBase.cs
View File

@ -472,7 +472,6 @@ namespace OpenSim.Framework.UserManagement
return logResponse.CreateDeadRegionResponse(); return logResponse.CreateDeadRegionResponse();
} }
CommitAgent(ref TheUser); CommitAgent(ref TheUser);
return logResponse.ToXmlRpcResponse(); return logResponse.ToXmlRpcResponse();
} }

1
OpenSim/Region/Communications/Local/LocalBackEndServices.cs
View File

@ -182,7 +182,6 @@ namespace OpenSim.Region.Communications.Local
/// <returns></returns> /// <returns></returns>
public bool AddNewSession(ulong regionHandle, Login loginData) public bool AddNewSession(ulong regionHandle, Login loginData)
{ {
//Console.WriteLine(" comms manager been told to expect new user");
AgentCircuitData agent = new AgentCircuitData(); AgentCircuitData agent = new AgentCircuitData();
agent.AgentID = loginData.Agent; agent.AgentID = loginData.Agent;
agent.firstname = loginData.First; agent.firstname = loginData.First;

2
OpenSim/Region/Communications/Local/LocalUserServices.cs
View File

@ -88,7 +88,7 @@ namespace OpenSim.Region.Communications.Local
"'position':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "], " + "'position':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "], " +
"'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}"; "'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}";
string capsPath = Util.GetRandomCapsPath(); string capsPath = Util.GetRandomCapsPath();
response.SimAddress = reg.CommsIPListenAddr; response.SimAddress = reg.CommsExternalAddress;
response.SimPort = (Int32)reg.CommsIPListenPort; response.SimPort = (Int32)reg.CommsIPListenPort;
response.RegionX = reg.RegionLocX ; response.RegionX = reg.RegionLocX ;
response.RegionY = reg.RegionLocY ; response.RegionY = reg.RegionLocY ;