Merge branch 'presence-refactor' of ssh://opensimulator.org/var/git/opensim into presence-refactor

1 files changed, 2 insertions, 3 deletions

diff --git a/OpenSim/Services/Interfaces/IFriendsService.cs b/OpenSim/Services/Interfaces/IFriendsService.cs
index ed77c1a..4e665cd 100644
--- a/OpenSim/Services/Interfaces/IFriendsService.cs
+++ b/OpenSim/Services/Interfaces/IFriendsService.cs
@@ -35,15 +35,14 @@ namespace OpenSim.Region.Framework.Interfaces
     {
         public UUID PrincipalID;
         public string Friend;
-        int MyRights;
-        int TheirRights;
+        int MyFlags;
+        int TheirFlags;
     }
 
     public interface IFriendsService
     {
         FriendInfo[] GetFriends(UUID PrincipalID);
         bool StoreFriend(UUID PrincipalID, string Friend, int flags);
-        bool SetFlags(UUID PrincipalID, int flags);
         bool Delete(UUID PrincipalID, string Friend);
     }
 }