diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | 5 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs index 91f19e3..772485c 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | |||
@@ -247,11 +247,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
247 | { | 247 | { |
248 | FriendInfo[] friends = GetFriendsFromCache(principalID); | 248 | FriendInfo[] friends = GetFriendsFromCache(principalID); |
249 | FriendInfo finfo = GetFriend(friends, friendID); | 249 | FriendInfo finfo = GetFriend(friends, friendID); |
250 | if (finfo != null) | 250 | if (finfo != null && finfo.TheirFlags != -1) |
251 | { | 251 | { |
252 | return finfo.TheirFlags; | 252 | return finfo.TheirFlags; |
253 | } | 253 | } |
254 | |||
255 | return 0; | 254 | return 0; |
256 | } | 255 | } |
257 | 256 | ||
@@ -756,7 +755,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
756 | if (friend == null) | 755 | if (friend == null) |
757 | return; | 756 | return; |
758 | 757 | ||
759 | if((friend.TheirFlags & (int)FriendRights.CanSeeOnMap) == 0) | 758 | if(friend.TheirFlags == -1 || (friend.TheirFlags & (int)FriendRights.CanSeeOnMap) == 0) |
760 | return; | 759 | return; |
761 | 760 | ||
762 | Scene hunterScene = (Scene)remoteClient.Scene; | 761 | Scene hunterScene = (Scene)remoteClient.Scene; |
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs index 82154bc..fae1e05 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs | |||
@@ -214,7 +214,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
214 | FriendInfo[] friends = GetFriendsFromCache(client.AgentId); | 214 | FriendInfo[] friends = GetFriendsFromCache(client.AgentId); |
215 | foreach (FriendInfo f in friends) | 215 | foreach (FriendInfo f in friends) |
216 | { | 216 | { |
217 | client.SendChangeUserRights(new UUID(f.Friend), client.AgentId, f.TheirFlags); | 217 | int rights = f.TheirFlags; |
218 | if(rights != -1 ) | ||
219 | client.SendChangeUserRights(new UUID(f.Friend), client.AgentId, rights); | ||
218 | } | 220 | } |
219 | } | 221 | } |
220 | } | 222 | } |