aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid/UserServer
diff options
context:
space:
mode:
authorMelanie Thielker2008-08-14 00:04:37 +0000
committerMelanie Thielker2008-08-14 00:04:37 +0000
commite3157e61aa50d057b4345cb9d49c973afeb26b15 (patch)
tree8452565ff0d7e6c3d07541743e0e5f665bc7d03c /OpenSim/Grid/UserServer
parent* minor: make it clear on the console when a client is being logged out becau... (diff)
downloadopensim-SC_OLD-e3157e61aa50d057b4345cb9d49c973afeb26b15.zip
opensim-SC_OLD-e3157e61aa50d057b4345cb9d49c973afeb26b15.tar.gz
opensim-SC_OLD-e3157e61aa50d057b4345cb9d49c973afeb26b15.tar.bz2
opensim-SC_OLD-e3157e61aa50d057b4345cb9d49c973afeb26b15.tar.xz
Mantis #1946
Thank you, HomerHorwitz, for a patch that corrects and improves TP to landmark and home position handling.
Diffstat (limited to 'OpenSim/Grid/UserServer')
-rw-r--r--OpenSim/Grid/UserServer/UserManager.cs7
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs
index a43ade1..36f2a0d 100644
--- a/OpenSim/Grid/UserServer/UserManager.cs
+++ b/OpenSim/Grid/UserServer/UserManager.cs
@@ -151,6 +151,7 @@ namespace OpenSim.Grid.UserServer
151 responseData["home_coordinates_z"] = profile.HomeLocation.Z.ToString(); 151 responseData["home_coordinates_z"] = profile.HomeLocation.Z.ToString();
152 152
153 responseData["home_region"] = profile.HomeRegion.ToString(); 153 responseData["home_region"] = profile.HomeRegion.ToString();
154 responseData["home_region_id"] = profile.HomeRegionID.ToString();
154 155
155 responseData["home_look_x"] = profile.HomeLookAt.X.ToString(); 156 responseData["home_look_x"] = profile.HomeLookAt.X.ToString();
156 responseData["home_look_y"] = profile.HomeLookAt.Y.ToString(); 157 responseData["home_look_y"] = profile.HomeLookAt.Y.ToString();
@@ -564,6 +565,12 @@ namespace OpenSim.Grid.UserServer
564 } 565 }
565 566
566 } 567 }
568 if (requestData.Contains("home_region_id"))
569 {
570 LLUUID regionID = LLUUID.Zero;
571 LLUUID.TryParse((string)requestData["home_region_id"], out regionID);
572 userProfile.HomeRegionID = regionID;
573 }
567 if (requestData.Contains("home_pos_x")) 574 if (requestData.Contains("home_pos_x"))
568 { 575 {
569 try 576 try