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

varregion: send region size in LLLoginResponse.

master-beforevarregion
Robert Adams 2013-11-02 15:42:26 -07:00 committed by Robert Adams
parent d9848943a9
commit 004ecee314
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Services/LLLoginService/LLLoginResponse.cs
View File

@ -254,11 +254,12 @@ namespace OpenSim.Services.LLLoginService
Currency = currency; Currency = currency;
ClassifiedFee = classifiedFee; ClassifiedFee = classifiedFee;
FillOutHomeData(pinfo, home); FillOutHomeData(pinfo, home);
LookAt = String.Format("[r{0},r{1},r{2}]", lookAt.X, lookAt.Y, lookAt.Z); LookAt = String.Format("[r{0},r{1},r{2}]", lookAt.X, lookAt.Y, lookAt.Z);
FillOutRegionData(destination); FillOutRegionData(destination);
m_log.DebugFormat("[LOGIN RESPONSE] LLLoginResponse create. sizeX={0}, sizeY={1}", RegionSizeX, RegionSizeY);
Util.PrintCallStack();
FillOutSeedCap(aCircuit, destination, clientIP); FillOutSeedCap(aCircuit, destination, clientIP);
@ -384,6 +385,8 @@ namespace OpenSim.Services.LLLoginService
SimPort = (uint)endPoint.Port; SimPort = (uint)endPoint.Port;
RegionX = (uint)destination.RegionLocX; RegionX = (uint)destination.RegionLocX;
RegionY = (uint)destination.RegionLocY; RegionY = (uint)destination.RegionLocY;
RegionSizeX = destination.RegionSizeX;
RegionSizeY = destination.RegionSizeY;
} }
private void FillOutSeedCap(AgentCircuitData aCircuit, GridRegion destination, IPEndPoint ipepClient) private void FillOutSeedCap(AgentCircuitData aCircuit, GridRegion destination, IPEndPoint ipepClient)
@ -529,6 +532,9 @@ namespace OpenSim.Services.LLLoginService
responseData["message"] = welcomeMessage; responseData["message"] = welcomeMessage;
responseData["region_x"] = (Int32)(RegionX); responseData["region_x"] = (Int32)(RegionX);
responseData["region_y"] = (Int32)(RegionY); responseData["region_y"] = (Int32)(RegionY);
responseData["region_size_x"] = (Int32)RegionSizeX;
responseData["region_size_y"] = (Int32)RegionSizeY;
m_log.DebugFormat("[LOGIN RESPONSE] returning sizeX={0}, sizeY={1}", RegionSizeX, RegionSizeY);
if (searchURL != String.Empty) if (searchURL != String.Empty)
responseData["search"] = searchURL; responseData["search"] = searchURL;
@ -918,6 +924,9 @@ namespace OpenSim.Services.LLLoginService
set { regionY = value; } set { regionY = value; }
} }
public int RegionSizeX { get; private set; }
public int RegionSizeY { get; private set; }
public string SunTexture public string SunTexture
{ {
get { return sunTexture; } get { return sunTexture; }

3
OpenSim/Services/LLLoginService/LLLoginService.cs
View File

@ -50,6 +50,8 @@ namespace OpenSim.Services.LLLoginService
public class LLLoginService : ILoginService public class LLLoginService : ILoginService
{ {
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private static readonly string LogHeader = "[LLOGIN SERVICE]";
private static bool Initialized = false; private static bool Initialized = false;
protected IUserAccountService m_UserAccountService; protected IUserAccountService m_UserAccountService;
@ -389,6 +391,7 @@ namespace OpenSim.Services.LLLoginService
if (guinfo == null) if (guinfo == null)
{ {
// something went wrong, make something up, so that we don't have to test this anywhere else // something went wrong, make something up, so that we don't have to test this anywhere else
m_log.DebugFormat("{0} Failed to fetch GridUserInfo. Creating empty GridUserInfo as home", LogHeader);
guinfo = new GridUserInfo(); guinfo = new GridUserInfo();
guinfo.LastPosition = guinfo.HomePosition = new Vector3(128, 128, 30); guinfo.LastPosition = guinfo.HomePosition = new Vector3(128, 128, 30);
} }