diff options
Diffstat (limited to 'OpenSim/Grid/UserServer/UserLoginService.cs')
| -rw-r--r-- | OpenSim/Grid/UserServer/UserLoginService.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs index af234e2..09cd9fd 100644 --- a/OpenSim/Grid/UserServer/UserLoginService.cs +++ b/OpenSim/Grid/UserServer/UserLoginService.cs | |||
| @@ -82,8 +82,8 @@ namespace OpenSim.Grid.UserServer | |||
| 82 | // Customise the response | 82 | // Customise the response |
| 83 | //CFK: This is redundant and the next message should always appear. | 83 | //CFK: This is redundant and the next message should always appear. |
| 84 | //CFK: m_log.Info("[LOGIN]: Home Location"); | 84 | //CFK: m_log.Info("[LOGIN]: Home Location"); |
| 85 | response.Home = "{'region_handle':[r" + (SimInfo.regionLocX*256).ToString() + ",r" + | 85 | response.Home = "{'region_handle':[r" + (SimInfo.regionLocX * Constants.RegionSize).ToString() + ",r" + |
| 86 | (SimInfo.regionLocY*256).ToString() + "], " + | 86 | (SimInfo.regionLocY * Constants.RegionSize).ToString() + "], " + |
| 87 | "'position':[r" + theUser.homeLocation.X.ToString() + ",r" + | 87 | "'position':[r" + theUser.homeLocation.X.ToString() + ",r" + |
| 88 | theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "], " + | 88 | theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "], " + |
| 89 | "'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + | 89 | "'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + |
| @@ -144,7 +144,7 @@ namespace OpenSim.Grid.UserServer | |||
| 144 | // Send him to default region instead | 144 | // Send him to default region instead |
| 145 | // Load information from the gridserver | 145 | // Load information from the gridserver |
| 146 | 146 | ||
| 147 | ulong defaultHandle = (((ulong) m_config.DefaultX*256) << 32) | ((ulong) m_config.DefaultY*256); | 147 | ulong defaultHandle = (((ulong)m_config.DefaultX * Constants.RegionSize) << 32) | ((ulong)m_config.DefaultY * Constants.RegionSize); |
| 148 | 148 | ||
| 149 | m_log.Warn( | 149 | m_log.Warn( |
| 150 | "[LOGIN]: Home region not available: sending to default " + defaultHandle.ToString()); | 150 | "[LOGIN]: Home region not available: sending to default " + defaultHandle.ToString()); |
| @@ -158,8 +158,8 @@ namespace OpenSim.Grid.UserServer | |||
| 158 | 158 | ||
| 159 | // Customise the response | 159 | // Customise the response |
| 160 | m_log.Info("[LOGIN]: Home Location"); | 160 | m_log.Info("[LOGIN]: Home Location"); |
| 161 | response.Home = "{'region_handle':[r" + (SimInfo.regionLocX*256).ToString() + ",r" + | 161 | response.Home = "{'region_handle':[r" + (SimInfo.regionLocX * Constants.RegionSize).ToString() + ",r" + |
| 162 | (SimInfo.regionLocY*256).ToString() + "], " + | 162 | (SimInfo.regionLocY * Constants.RegionSize).ToString() + "], " + |
| 163 | "'position':[r" + theUser.homeLocation.X.ToString() + ",r" + | 163 | "'position':[r" + theUser.homeLocation.X.ToString() + ",r" + |
| 164 | theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "], " + | 164 | theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "], " + |
| 165 | "'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + | 165 | "'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + |