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/Server | |
| parent | Fix an inventory fetch issue (diff) | |
| parent | Prevent dropping someone else's attachments (diff) | |
| download | opensim-SC-521e2c83558d77c0482bebb6764a22c1fb8c5fd9.zip opensim-SC-521e2c83558d77c0482bebb6764a22c1fb8c5fd9.tar.gz opensim-SC-521e2c83558d77c0482bebb6764a22c1fb8c5fd9.tar.bz2 opensim-SC-521e2c83558d77c0482bebb6764a22c1fb8c5fd9.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Server')
| -rw-r--r-- | OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs b/OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs index f8fa429..485bc3e 100644 --- a/OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs +++ b/OpenSim/Server/Handlers/GridUser/GridUserServerPostHandler.cs | |||
| @@ -131,7 +131,7 @@ namespace OpenSim.Server.Handlers.GridUser | |||
| 131 | if (!UnpackArgs(request, out userID, out regionID, out position, out lookat)) | 131 | if (!UnpackArgs(request, out userID, out regionID, out position, out lookat)) |
| 132 | return FailureResult(); | 132 | return FailureResult(); |
| 133 | 133 | ||
| 134 | if (m_GridUserService.LoggedOut(userID, regionID, position, lookat)) | 134 | if (m_GridUserService.LoggedOut(userID, UUID.Zero, regionID, position, lookat)) |
| 135 | return SuccessResult(); | 135 | return SuccessResult(); |
| 136 | 136 | ||
| 137 | return FailureResult(); | 137 | return FailureResult(); |
| @@ -166,7 +166,7 @@ namespace OpenSim.Server.Handlers.GridUser | |||
| 166 | if (!UnpackArgs(request, out user, out region, out position, out look)) | 166 | if (!UnpackArgs(request, out user, out region, out position, out look)) |
| 167 | return FailureResult(); | 167 | return FailureResult(); |
| 168 | 168 | ||
| 169 | if (m_GridUserService.SetLastPosition(user, region, position, look)) | 169 | if (m_GridUserService.SetLastPosition(user, UUID.Zero, region, position, look)) |
| 170 | return SuccessResult(); | 170 | return SuccessResult(); |
| 171 | 171 | ||
| 172 | return FailureResult(); | 172 | return FailureResult(); |