diff options
| author | Donnie Roberts | 2013-06-05 19:55:18 -0400 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-06-07 18:43:00 +0100 |
| commit | 045c26f6265ff4e66f07280da555e10a0dc9e2fa (patch) | |
| tree | 16710167e94ed64bd844cc5c816df82b97b43b9c /OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-045c26f6265ff4e66f07280da555e10a0dc9e2fa.zip opensim-SC_OLD-045c26f6265ff4e66f07280da555e10a0dc9e2fa.tar.gz opensim-SC_OLD-045c26f6265ff4e66f07280da555e10a0dc9e2fa.tar.bz2 opensim-SC_OLD-045c26f6265ff4e66f07280da555e10a0dc9e2fa.tar.xz | |
In LocalFriendshipTerminated, send the original client's agentId to the friend being removed instead of the friend's own id.
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs index 637beef..08196f1 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs | |||
| @@ -193,7 +193,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
| 193 | if (!UUID.TryParse(request["ToID"].ToString(), out toID)) | 193 | if (!UUID.TryParse(request["ToID"].ToString(), out toID)) |
| 194 | return FailureResult(); | 194 | return FailureResult(); |
| 195 | 195 | ||
| 196 | if (m_FriendsModule.LocalFriendshipTerminated(toID)) | 196 | if (m_FriendsModule.LocalFriendshipTerminated(fromID, toID)) |
| 197 | return SuccessResult(); | 197 | return SuccessResult(); |
| 198 | 198 | ||
| 199 | return FailureResult(); | 199 | return FailureResult(); |