diff options
author | Melanie Thielker | 2008-08-14 00:04:37 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-08-14 00:04:37 +0000 |
commit | e3157e61aa50d057b4345cb9d49c973afeb26b15 (patch) | |
tree | 8452565ff0d7e6c3d07541743e0e5f665bc7d03c /OpenSim/Region/Communications | |
parent | * minor: make it clear on the console when a client is being logged out becau... (diff) | |
download | opensim-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 '')
-rw-r--r-- | OpenSim/Region/Communications/Local/LocalBackEndServices.cs | 10 | ||||
-rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1UserServices.cs | 4 |
2 files changed, 13 insertions, 1 deletions
diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs index 8d6bbcc..a608da0 100644 --- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs +++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs | |||
@@ -172,6 +172,16 @@ namespace OpenSim.Region.Communications.Local | |||
172 | return null; | 172 | return null; |
173 | } | 173 | } |
174 | 174 | ||
175 | public RegionInfo RequestNeighbourInfo(LLUUID regionID) | ||
176 | { | ||
177 | // TODO add a dictionary for faster lookup | ||
178 | foreach(RegionInfo info in m_regions.Values) | ||
179 | { | ||
180 | if(info.RegionID == regionID) return info; | ||
181 | } | ||
182 | return null; | ||
183 | } | ||
184 | |||
175 | public RegionInfo RequestClosestRegion(string regionName) | 185 | public RegionInfo RequestClosestRegion(string regionName) |
176 | { | 186 | { |
177 | foreach (RegionInfo regInfo in m_regions.Values) | 187 | foreach (RegionInfo regInfo in m_regions.Values) |
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs index c6f905f..2d37e2f 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs | |||
@@ -75,6 +75,8 @@ namespace OpenSim.Region.Communications.OGS1 | |||
75 | userData.Image = new LLUUID((string) data["profile_image"]); | 75 | userData.Image = new LLUUID((string) data["profile_image"]); |
76 | userData.LastLogin = Convert.ToInt32((string) data["profile_lastlogin"]); | 76 | userData.LastLogin = Convert.ToInt32((string) data["profile_lastlogin"]); |
77 | userData.HomeRegion = Convert.ToUInt64((string) data["home_region"]); | 77 | userData.HomeRegion = Convert.ToUInt64((string) data["home_region"]); |
78 | if(data.Contains("home_region_id")) userData.HomeRegionID = new LLUUID((string)data["home_region_id"]); | ||
79 | else userData.HomeRegionID = LLUUID.Zero; | ||
78 | userData.HomeLocation = | 80 | userData.HomeLocation = |
79 | new LLVector3((float) Convert.ToDecimal((string) data["home_coordinates_x"]), | 81 | new LLVector3((float) Convert.ToDecimal((string) data["home_coordinates_x"]), |
80 | (float) Convert.ToDecimal((string) data["home_coordinates_y"]), | 82 | (float) Convert.ToDecimal((string) data["home_coordinates_y"]), |
@@ -83,7 +85,6 @@ namespace OpenSim.Region.Communications.OGS1 | |||
83 | new LLVector3((float) Convert.ToDecimal((string) data["home_look_x"]), | 85 | new LLVector3((float) Convert.ToDecimal((string) data["home_look_x"]), |
84 | (float) Convert.ToDecimal((string) data["home_look_y"]), | 86 | (float) Convert.ToDecimal((string) data["home_look_y"]), |
85 | (float) Convert.ToDecimal((string) data["home_look_z"])); | 87 | (float) Convert.ToDecimal((string) data["home_look_z"])); |
86 | |||
87 | return userData; | 88 | return userData; |
88 | } | 89 | } |
89 | 90 | ||
@@ -453,6 +454,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
453 | //param["ProfileURL"] = UserProfile.ProfileURL.ToString(); | 454 | //param["ProfileURL"] = UserProfile.ProfileURL.ToString(); |
454 | 455 | ||
455 | param["home_region"] = UserProfile.HomeRegion.ToString(); | 456 | param["home_region"] = UserProfile.HomeRegion.ToString(); |
457 | param["home_region_id"] = UserProfile.HomeRegionID.ToString(); | ||
456 | 458 | ||
457 | param["home_pos_x"] = UserProfile.HomeLocationX.ToString(); | 459 | param["home_pos_x"] = UserProfile.HomeLocationX.ToString(); |
458 | param["home_pos_y"] = UserProfile.HomeLocationY.ToString(); | 460 | param["home_pos_y"] = UserProfile.HomeLocationY.ToString(); |