ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-09 02:36:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Mantis #1953

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

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

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