OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Mantis #1953 

Thank you, HomerHorwitz, for a patch that changes login location handling
to use the sim UUID if it has already been stored.
0.6.0-stable
Melanie Thielker 2008-08-14 16:48:51 +00:00
parent 17715da311
commit 35aeb9010a
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Data/RegionProfileData.cs
View File

@ -171,7 +171,7 @@ namespace OpenSim.Data
/// <summary> /// <summary>
/// Request sim profile information from a grid server, by Region UUID /// Request sim profile information from a grid server, by Region UUID
/// </summary> /// </summary>
/// <param name="region_uuid">The region UUID to look for</param> /// <param name="region_UUID">The region UUID to look for</param>
/// <param name="gridserver_url"></param> /// <param name="gridserver_url"></param>
/// <param name="gridserver_sendkey"></param> /// <param name="gridserver_sendkey"></param>
/// <param name="gridserver_recvkey"></param> /// <param name="gridserver_recvkey"></param>
@ -180,7 +180,7 @@ namespace OpenSim.Data
public static RegionProfileData RequestSimProfileData(LLUUID region_uuid, Uri gridserver_url, public static RegionProfileData RequestSimProfileData(LLUUID region_uuid, Uri gridserver_url,
string gridserver_sendkey, string gridserver_recvkey) string gridserver_sendkey, string gridserver_recvkey)
{ {
return RequestSimData(gridserver_url, gridserver_sendkey, "region_uuid", region_uuid.UUID.ToString()); return RequestSimData(gridserver_url, gridserver_sendkey, "region_UUID", region_uuid.UUID.ToString());
} }
/// <summary> /// <summary>

23
OpenSim/Grid/UserServer/UserLoginService.cs
View File

@ -152,10 +152,21 @@ namespace OpenSim.Grid.UserServer
} }
else if (startLocationRequest == "home") else if (startLocationRequest == "home")
{ {
SimInfo = // use the homeRegionID if it is stored already. If not, use the regionHandle as before
RegionProfileData.RequestSimProfileData( if(theUser.HomeRegionID != LLUUID.Zero)
theUser.HomeRegion, m_config.GridServerURL, {
m_config.GridSendKey, m_config.GridRecvKey); SimInfo =
RegionProfileData.RequestSimProfileData(
theUser.HomeRegionID, m_config.GridServerURL,
m_config.GridSendKey, m_config.GridRecvKey);
}
else
{
SimInfo =
RegionProfileData.RequestSimProfileData(
theUser.HomeRegion, m_config.GridServerURL,
m_config.GridSendKey, m_config.GridRecvKey);
}
} }
else else
{ {
@ -201,8 +212,8 @@ namespace OpenSim.Grid.UserServer
(SimInfo.regionLocY * Constants.RegionSize).ToString() + "], " + (SimInfo.regionLocY * Constants.RegionSize).ToString() + "], " +
"'position':[r" + theUser.HomeLocation.X.ToString() + ",r" + "'position':[r" + theUser.HomeLocation.X.ToString() + ",r" +
theUser.HomeLocation.Y.ToString() + ",r" + theUser.HomeLocation.Z.ToString() + "], " + theUser.HomeLocation.Y.ToString() + ",r" + theUser.HomeLocation.Z.ToString() + "], " +
"'look_at':[r" + theUser.HomeLocation.X.ToString() + ",r" + "'look_at':[r" + theUser.HomeLookAt.X.ToString() + ",r" +
theUser.HomeLocation.Y.ToString() + ",r" + theUser.HomeLocation.Z.ToString() + "]}"; theUser.HomeLookAt.Y.ToString() + ",r" + theUser.HomeLookAt.Z.ToString() + "]}";
// Destination // Destination
//CFK: The "Notifying" message always seems to appear, so subsume the data from this message into //CFK: The "Notifying" message always seems to appear, so subsume the data from this message into