aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/LLLoginService/LLLoginResponse.cs
diff options
context:
space:
mode:
authorRobert Adams2013-11-02 15:42:26 -0700
committerRobert Adams2014-01-04 19:01:03 -0800
commit004ecee3147cde699adbedcb2fcd88caee87527a (patch)
tree90301a3eb748e6947b73433c0e2a7fc42ee4fc21 /OpenSim/Services/LLLoginService/LLLoginResponse.cs
parentAdd routines in Util.cs for conversion of region handles to region (diff)
downloadopensim-SC_OLD-004ecee3147cde699adbedcb2fcd88caee87527a.zip
opensim-SC_OLD-004ecee3147cde699adbedcb2fcd88caee87527a.tar.gz
opensim-SC_OLD-004ecee3147cde699adbedcb2fcd88caee87527a.tar.bz2
opensim-SC_OLD-004ecee3147cde699adbedcb2fcd88caee87527a.tar.xz
varregion: send region size in LLLoginResponse.
Diffstat (limited to 'OpenSim/Services/LLLoginService/LLLoginResponse.cs')
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginResponse.cs11
1 files changed, 10 insertions, 1 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
index 6ab5258..f96480c 100644
--- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
@@ -254,11 +254,12 @@ namespace OpenSim.Services.LLLoginService
254 Currency = currency; 254 Currency = currency;
255 ClassifiedFee = classifiedFee; 255 ClassifiedFee = classifiedFee;
256 256
257
258 FillOutHomeData(pinfo, home); 257 FillOutHomeData(pinfo, home);
259 LookAt = String.Format("[r{0},r{1},r{2}]", lookAt.X, lookAt.Y, lookAt.Z); 258 LookAt = String.Format("[r{0},r{1},r{2}]", lookAt.X, lookAt.Y, lookAt.Z);
260 259
261 FillOutRegionData(destination); 260 FillOutRegionData(destination);
261 m_log.DebugFormat("[LOGIN RESPONSE] LLLoginResponse create. sizeX={0}, sizeY={1}", RegionSizeX, RegionSizeY);
262 Util.PrintCallStack();
262 263
263 FillOutSeedCap(aCircuit, destination, clientIP); 264 FillOutSeedCap(aCircuit, destination, clientIP);
264 265
@@ -384,6 +385,8 @@ namespace OpenSim.Services.LLLoginService
384 SimPort = (uint)endPoint.Port; 385 SimPort = (uint)endPoint.Port;
385 RegionX = (uint)destination.RegionLocX; 386 RegionX = (uint)destination.RegionLocX;
386 RegionY = (uint)destination.RegionLocY; 387 RegionY = (uint)destination.RegionLocY;
388 RegionSizeX = destination.RegionSizeX;
389 RegionSizeY = destination.RegionSizeY;
387 } 390 }
388 391
389 private void FillOutSeedCap(AgentCircuitData aCircuit, GridRegion destination, IPEndPoint ipepClient) 392 private void FillOutSeedCap(AgentCircuitData aCircuit, GridRegion destination, IPEndPoint ipepClient)
@@ -529,6 +532,9 @@ namespace OpenSim.Services.LLLoginService
529 responseData["message"] = welcomeMessage; 532 responseData["message"] = welcomeMessage;
530 responseData["region_x"] = (Int32)(RegionX); 533 responseData["region_x"] = (Int32)(RegionX);
531 responseData["region_y"] = (Int32)(RegionY); 534 responseData["region_y"] = (Int32)(RegionY);
535 responseData["region_size_x"] = (Int32)RegionSizeX;
536 responseData["region_size_y"] = (Int32)RegionSizeY;
537 m_log.DebugFormat("[LOGIN RESPONSE] returning sizeX={0}, sizeY={1}", RegionSizeX, RegionSizeY);
532 538
533 if (searchURL != String.Empty) 539 if (searchURL != String.Empty)
534 responseData["search"] = searchURL; 540 responseData["search"] = searchURL;
@@ -918,6 +924,9 @@ namespace OpenSim.Services.LLLoginService
918 set { regionY = value; } 924 set { regionY = value; }
919 } 925 }
920 926
927 public int RegionSizeX { get; private set; }
928 public int RegionSizeY { get; private set; }
929
921 public string SunTexture 930 public string SunTexture
922 { 931 {
923 get { return sunTexture; } 932 get { return sunTexture; }