diff options
| author | Melanie | 2010-09-30 16:01:45 +0100 |
|---|---|---|
| committer | Melanie | 2010-09-30 16:01:45 +0100 |
| commit | 521e2c83558d77c0482bebb6764a22c1fb8c5fd9 (patch) | |
| tree | b58fdcab0d9ac8c9056413f005144384da1686a3 /OpenSim/Services/HypergridService | |
| parent | Fix an inventory fetch issue (diff) | |
| parent | Prevent dropping someone else's attachments (diff) | |
| download | opensim-SC_OLD-521e2c83558d77c0482bebb6764a22c1fb8c5fd9.zip opensim-SC_OLD-521e2c83558d77c0482bebb6764a22c1fb8c5fd9.tar.gz opensim-SC_OLD-521e2c83558d77c0482bebb6764a22c1fb8c5fd9.tar.bz2 opensim-SC_OLD-521e2c83558d77c0482bebb6764a22c1fb8c5fd9.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Services/HypergridService')
| -rw-r--r-- | OpenSim/Services/HypergridService/UserAgentService.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/HypergridService/UserAgentService.cs b/OpenSim/Services/HypergridService/UserAgentService.cs index 8c3be70..8acd618 100644 --- a/OpenSim/Services/HypergridService/UserAgentService.cs +++ b/OpenSim/Services/HypergridService/UserAgentService.cs | |||
| @@ -232,7 +232,7 @@ namespace OpenSim.Services.HypergridService | |||
| 232 | 232 | ||
| 233 | GridUserInfo guinfo = m_GridUserService.GetGridUserInfo(userID.ToString()); | 233 | GridUserInfo guinfo = m_GridUserService.GetGridUserInfo(userID.ToString()); |
| 234 | if (guinfo != null) | 234 | if (guinfo != null) |
| 235 | m_GridUserService.LoggedOut(userID.ToString(), guinfo.LastRegionID, guinfo.LastPosition, guinfo.LastLookAt); | 235 | m_GridUserService.LoggedOut(userID.ToString(), sessionID, guinfo.LastRegionID, guinfo.LastPosition, guinfo.LastLookAt); |
| 236 | } | 236 | } |
| 237 | 237 | ||
| 238 | // We need to prevent foreign users with the same UUID as a local user | 238 | // We need to prevent foreign users with the same UUID as a local user |