aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie Thielker2008-08-14 16:48:51 +0000
committerMelanie Thielker2008-08-14 16:48:51 +0000
commit35aeb9010a860fa9a90acdbe2278de28923d1de3 (patch)
tree1bd6c1d9f786f6233d084058193122f3b562791b
parentAdd the UserStore migrations to the TP fixes patch (diff)
downloadopensim-SC_OLD-35aeb9010a860fa9a90acdbe2278de28923d1de3.zip
opensim-SC_OLD-35aeb9010a860fa9a90acdbe2278de28923d1de3.tar.gz
opensim-SC_OLD-35aeb9010a860fa9a90acdbe2278de28923d1de3.tar.bz2
opensim-SC_OLD-35aeb9010a860fa9a90acdbe2278de28923d1de3.tar.xz
Mantis #1953
Thank you, HomerHorwitz, for a patch that changes login location handling to use the sim UUID if it has already been stored.
-rw-r--r--OpenSim/Data/RegionProfileData.cs4
-rw-r--r--OpenSim/Grid/UserServer/UserLoginService.cs23
2 files changed, 19 insertions, 8 deletions
diff --git a/OpenSim/Data/RegionProfileData.cs b/OpenSim/Data/RegionProfileData.cs
index f6172b9..9549b80 100644
--- a/OpenSim/Data/RegionProfileData.cs
+++ b/OpenSim/Data/RegionProfileData.cs
@@ -171,7 +171,7 @@ namespace OpenSim.Data
171 /// <summary> 171 /// <summary>
172 /// Request sim profile information from a grid server, by Region UUID 172 /// Request sim profile information from a grid server, by Region UUID
173 /// </summary> 173 /// </summary>
174 /// <param name="region_uuid">The region UUID to look for</param> 174 /// <param name="region_UUID">The region UUID to look for</param>
175 /// <param name="gridserver_url"></param> 175 /// <param name="gridserver_url"></param>
176 /// <param name="gridserver_sendkey"></param> 176 /// <param name="gridserver_sendkey"></param>
177 /// <param name="gridserver_recvkey"></param> 177 /// <param name="gridserver_recvkey"></param>
@@ -180,7 +180,7 @@ namespace OpenSim.Data
180 public static RegionProfileData RequestSimProfileData(LLUUID region_uuid, Uri gridserver_url, 180 public static RegionProfileData RequestSimProfileData(LLUUID region_uuid, Uri gridserver_url,
181 string gridserver_sendkey, string gridserver_recvkey) 181 string gridserver_sendkey, string gridserver_recvkey)
182 { 182 {
183 return RequestSimData(gridserver_url, gridserver_sendkey, "region_uuid", region_uuid.UUID.ToString()); 183 return RequestSimData(gridserver_url, gridserver_sendkey, "region_UUID", region_uuid.UUID.ToString());
184 } 184 }
185 185
186 /// <summary> 186 /// <summary>
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index 191e482..2a70534 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -152,10 +152,21 @@ namespace OpenSim.Grid.UserServer
152 } 152 }
153 else if (startLocationRequest == "home") 153 else if (startLocationRequest == "home")
154 { 154 {
155 SimInfo = 155 // use the homeRegionID if it is stored already. If not, use the regionHandle as before
156 RegionProfileData.RequestSimProfileData( 156 if(theUser.HomeRegionID != LLUUID.Zero)
157 theUser.HomeRegion, m_config.GridServerURL, 157 {
158 m_config.GridSendKey, m_config.GridRecvKey); 158 SimInfo =
159 RegionProfileData.RequestSimProfileData(
160 theUser.HomeRegionID, m_config.GridServerURL,
161 m_config.GridSendKey, m_config.GridRecvKey);
162 }
163 else
164 {
165 SimInfo =
166 RegionProfileData.RequestSimProfileData(
167 theUser.HomeRegion, m_config.GridServerURL,
168 m_config.GridSendKey, m_config.GridRecvKey);
169 }
159 } 170 }
160 else 171 else
161 { 172 {
@@ -201,8 +212,8 @@ namespace OpenSim.Grid.UserServer
201 (SimInfo.regionLocY * Constants.RegionSize).ToString() + "], " + 212 (SimInfo.regionLocY * Constants.RegionSize).ToString() + "], " +
202 "'position':[r" + theUser.HomeLocation.X.ToString() + ",r" + 213 "'position':[r" + theUser.HomeLocation.X.ToString() + ",r" +
203 theUser.HomeLocation.Y.ToString() + ",r" + theUser.HomeLocation.Z.ToString() + "], " + 214 theUser.HomeLocation.Y.ToString() + ",r" + theUser.HomeLocation.Z.ToString() + "], " +
204 "'look_at':[r" + theUser.HomeLocation.X.ToString() + ",r" + 215 "'look_at':[r" + theUser.HomeLookAt.X.ToString() + ",r" +
205 theUser.HomeLocation.Y.ToString() + ",r" + theUser.HomeLocation.Z.ToString() + "]}"; 216 theUser.HomeLookAt.Y.ToString() + ",r" + theUser.HomeLookAt.Z.ToString() + "]}";
206 217
207 // Destination 218 // Destination
208 //CFK: The "Notifying" message always seems to appear, so subsume the data from this message into 219 //CFK: The "Notifying" message always seems to appear, so subsume the data from this message into