aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/LLLoginService
diff options
context:
space:
mode:
authorRobert Adams2013-12-26 22:45:59 -0800
committerRobert Adams2013-12-26 22:45:59 -0800
commit2d2bea4aa75ff6e82384f0842fe3719bf946b1cc (patch)
tree9c1429ad59674925944ece4ec366888794e91822 /OpenSim/Services/LLLoginService
parentvarregion: add lots of DEBUG level log messages. Especially for teleport. (diff)
downloadopensim-SC_OLD-2d2bea4aa75ff6e82384f0842fe3719bf946b1cc.zip
opensim-SC_OLD-2d2bea4aa75ff6e82384f0842fe3719bf946b1cc.tar.gz
opensim-SC_OLD-2d2bea4aa75ff6e82384f0842fe3719bf946b1cc.tar.bz2
opensim-SC_OLD-2d2bea4aa75ff6e82384f0842fe3719bf946b1cc.tar.xz
varregion: many more updates removing the constant RegionSize and replacing
with a passed region size. This time in the map code and grid services code.
Diffstat (limited to 'OpenSim/Services/LLLoginService')
-rw-r--r--OpenSim/Services/LLLoginService/LLLoginResponse.cs33
1 files changed, 16 insertions, 17 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginResponse.cs b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
index ff51f09..6a0a799 100644
--- a/OpenSim/Services/LLLoginService/LLLoginResponse.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginResponse.cs
@@ -362,7 +362,6 @@ namespace OpenSim.Services.LLLoginService
362 362
363 private void FillOutHomeData(GridUserInfo pinfo, GridRegion home) 363 private void FillOutHomeData(GridUserInfo pinfo, GridRegion home)
364 { 364 {
365 // int x = 1000 * (int)Constants.RegionSize, y = 1000 * (int)Constants.RegionSize;
366 int x = (int)Util.RegionToWorldLoc(1000); 365 int x = (int)Util.RegionToWorldLoc(1000);
367 int y = (int)Util.RegionToWorldLoc(1000); 366 int y = (int)Util.RegionToWorldLoc(1000);
368 if (home != null) 367 if (home != null)
@@ -438,22 +437,22 @@ namespace OpenSim.Services.LLLoginService
438 ErrorReason = "key"; 437 ErrorReason = "key";
439 welcomeMessage = "Welcome to OpenSim!"; 438 welcomeMessage = "Welcome to OpenSim!";
440 seedCapability = String.Empty; 439 seedCapability = String.Empty;
441 home = "{'region_handle':[r" 440 home = "{'region_handle':["
442 + Util.RegionToWorldLoc(1000).ToString() 441 + "r" + Util.RegionToWorldLoc(1000).ToString()
443 + ",r" 442 + ","
444 + Util.RegionToWorldLoc(1000).ToString() 443 + "r" + Util.RegionToWorldLoc(1000).ToString()
445 + "], 'position':[r" 444 + "], 'position':["
446 + userProfile.homepos.X.ToString() 445 + "r" + userProfile.homepos.X.ToString()
447 + ",r" 446 + ","
448 + userProfile.homepos.Y.ToString() 447 + "r" + userProfile.homepos.Y.ToString()
449 + ",r" 448 + ","
450 + userProfile.homepos.Z.ToString() 449 + "r" + userProfile.homepos.Z.ToString()
451 + "], 'look_at':[r" 450 + "], 'look_at':["
452 + userProfile.homelookat.X.ToString() 451 + "r" + userProfile.homelookat.X.ToString()
453 + ",r" 452 + ","
454 + userProfile.homelookat.Y.ToString() 453 + "r" + userProfile.homelookat.Y.ToString()
455 + ",r" 454 + ","
456 + userProfile.homelookat.Z.ToString() 455 + "r" + userProfile.homelookat.Z.ToString()
457 + "]}"; 456 + "]}";
458 lookAt = "[r0.99949799999999999756,r0.03166859999999999814,r0]"; 457 lookAt = "[r0.99949799999999999756,r0.03166859999999999814,r0]";
459 RegionX = (uint) 255232; 458 RegionX = (uint) 255232;