diff options
| author | Melanie | 2010-05-16 15:02:23 +0100 |
|---|---|---|
| committer | Melanie | 2010-05-16 15:02:23 +0100 |
| commit | a723225179503cf24b37471094208fd53281489c (patch) | |
| tree | ff086095ff8424eb311ca73b5e8a1b069c76af87 /OpenSim/Region/CoreModules/Avatar | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | Add some debug output to GetAgent to try and track down our presence problems (diff) | |
| download | opensim-SC-a723225179503cf24b37471094208fd53281489c.zip opensim-SC-a723225179503cf24b37471094208fd53281489c.tar.gz opensim-SC-a723225179503cf24b37471094208fd53281489c.tar.bz2 opensim-SC-a723225179503cf24b37471094208fd53281489c.tar.xz | |
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs index 5dc9c44..5339dee 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | |||
| @@ -201,9 +201,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
| 201 | 201 | ||
| 202 | UserFriendData data = m_Friends[principalID]; | 202 | UserFriendData data = m_Friends[principalID]; |
| 203 | 203 | ||
| 204 | string searchFor = friendID.ToString(); | ||
| 204 | foreach (FriendInfo fi in data.Friends) | 205 | foreach (FriendInfo fi in data.Friends) |
| 205 | { | 206 | { |
| 206 | if (fi.Friend == friendID.ToString()) | 207 | if (fi.Friend == searchFor) |
| 207 | return (uint)fi.TheirFlags; | 208 | return (uint)fi.TheirFlags; |
| 208 | } | 209 | } |
| 209 | return 0; | 210 | return 0; |