diff options
author | Diva Canto | 2010-06-29 06:37:39 -0700 |
---|---|---|
committer | Diva Canto | 2010-06-29 06:37:39 -0700 |
commit | 1cd9118c7a72a6e80aafe56134630682f2bb04d0 (patch) | |
tree | 09f953b9b6150ea29153917b2c159fa621a1cf66 /OpenSim/Region/CoreModules/Avatar/Friends | |
parent | don't report the null uuid as a missing asset on saving oars/iars (diff) | |
parent | This file wants to be committed. (diff) | |
download | opensim-SC_OLD-1cd9118c7a72a6e80aafe56134630682f2bb04d0.zip opensim-SC_OLD-1cd9118c7a72a6e80aafe56134630682f2bb04d0.tar.gz opensim-SC_OLD-1cd9118c7a72a6e80aafe56134630682f2bb04d0.tar.bz2 opensim-SC_OLD-1cd9118c7a72a6e80aafe56134630682f2bb04d0.tar.xz |
Merge branch 'master' into 0.7-post-fixes
Conflicts:
OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Friends')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs index 5552be7..6f044cb 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | |||
@@ -768,8 +768,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
768 | bool canEditObjectsChanged = ((rights ^ userFlags) & (int)FriendRights.CanModifyObjects) != 0; | 768 | bool canEditObjectsChanged = ((rights ^ userFlags) & (int)FriendRights.CanModifyObjects) != 0; |
769 | if (canEditObjectsChanged) | 769 | if (canEditObjectsChanged) |
770 | friendClient.SendChangeUserRights(userID, friendID, rights); | 770 | friendClient.SendChangeUserRights(userID, friendID, rights); |
771 | |||
771 | } | 772 | } |
772 | 773 | ||
774 | // update local cache | ||
775 | //m_Friends[friendID].Friends = m_FriendsService.GetFriends(friendID); | ||
776 | foreach (FriendInfo finfo in m_Friends[friendID].Friends) | ||
777 | if (finfo.Friend == userID.ToString()) | ||
778 | finfo.TheirFlags = rights; | ||
779 | |||
773 | return true; | 780 | return true; |
774 | } | 781 | } |
775 | 782 | ||