diff options
| author | Melanie | 2011-11-14 20:34:49 +0000 |
|---|---|---|
| committer | Melanie | 2011-11-14 20:34:49 +0000 |
| commit | df35720cf58e9e408e1c7bc2526b169a1af84d9d (patch) | |
| tree | 26ceae4ea3e0f32de16eef26c306053523534d31 /OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | |
| parent | Fix build break (diff) | |
| parent | Merge branch 'remove-scene-viewer' (diff) | |
| download | opensim-SC-df35720cf58e9e408e1c7bc2526b169a1af84d9d.zip opensim-SC-df35720cf58e9e408e1c7bc2526b169a1af84d9d.tar.gz opensim-SC-df35720cf58e9e408e1c7bc2526b169a1af84d9d.tar.bz2 opensim-SC-df35720cf58e9e408e1c7bc2526b169a1af84d9d.tar.xz | |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/Framework/Scenes/SceneViewer.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs index 8e5de7d..0c81bb2 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | |||
| @@ -572,10 +572,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
| 572 | { | 572 | { |
| 573 | m_log.DebugFormat("[FRIENDS]: {0} accepted friendship from {1}", client.AgentId, friendID); | 573 | m_log.DebugFormat("[FRIENDS]: {0} accepted friendship from {1}", client.AgentId, friendID); |
| 574 | 574 | ||
| 575 | AddFriend(client, friendID); | 575 | AddFriendship(client, friendID); |
| 576 | } | 576 | } |
| 577 | 577 | ||
| 578 | public void AddFriend(IClientAPI client, UUID friendID) | 578 | public void AddFriendship(IClientAPI client, UUID friendID) |
| 579 | { | 579 | { |
| 580 | StoreFriendships(client.AgentId, friendID); | 580 | StoreFriendships(client.AgentId, friendID); |
| 581 | 581 | ||