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

Mantis#2041. Thank you kindly, HomerHorwitz for a patch that: 

The attached patch fixes that your home-location icon is 
displayed on the region you logged in, not on your home-region.
0.6.0-stable
Charles Krinke 2008-08-24 15:54:10 +00:00
parent ec9137c4fa
commit d190f1d2dc
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -140,9 +140,27 @@ namespace OpenSim.Grid.UserServer
try try
{ {
RegionProfileData SimInfo = null; RegionProfileData SimInfo = null;
RegionProfileData HomeInfo = null;
int start_x = -1; int start_x = -1;
int start_y = -1; int start_y = -1;
int start_z = -1; int start_z = -1;
// use the homeRegionID if it is stored already. If not, use the regionHandle as before
if (theUser.HomeRegionID != LLUUID.Zero)
{
HomeInfo =
RegionProfileData.RequestSimProfileData(
theUser.HomeRegionID, m_config.GridServerURL,
m_config.GridSendKey, m_config.GridRecvKey);
}
else
{
HomeInfo =
RegionProfileData.RequestSimProfileData(
theUser.HomeRegion, m_config.GridServerURL,
m_config.GridSendKey, m_config.GridRecvKey);
}
if (startLocationRequest == "last") if (startLocationRequest == "last")
{ {
SimInfo = SimInfo =
@ -152,21 +170,7 @@ namespace OpenSim.Grid.UserServer
} }
else if (startLocationRequest == "home") else if (startLocationRequest == "home")
{ {
// use the homeRegionID if it is stored already. If not, use the regionHandle as before SimInfo = HomeInfo;
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 else
{ {
@ -191,10 +195,7 @@ namespace OpenSim.Grid.UserServer
if (SimInfo == null) if (SimInfo == null)
{ {
m_log.Info("[LOGIN]: Didn't find region with a close name match sending to home location"); m_log.Info("[LOGIN]: Didn't find region with a close name match sending to home location");
SimInfo = SimInfo = HomeInfo;
RegionProfileData.RequestSimProfileData(
theUser.HomeRegion, m_config.GridServerURL,
m_config.GridSendKey, m_config.GridRecvKey);
} }
else else
{ {
@ -208,8 +209,8 @@ namespace OpenSim.Grid.UserServer
// Customise the response // Customise the response
//CFK: This is redundant and the next message should always appear. //CFK: This is redundant and the next message should always appear.
//CFK: m_log.Info("[LOGIN]: Home Location"); //CFK: m_log.Info("[LOGIN]: Home Location");
response.Home = "{'region_handle':[r" + (SimInfo.regionLocX * Constants.RegionSize).ToString() + ",r" + response.Home = "{'region_handle':[r" + (HomeInfo.regionLocX * Constants.RegionSize).ToString() + ",r" +
(SimInfo.regionLocY * Constants.RegionSize).ToString() + "], " + (HomeInfo.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.HomeLookAt.X.ToString() + ",r" + "'look_at':[r" + theUser.HomeLookAt.X.ToString() + ",r" +