Fixed permissions bug related to friends in PermissionsModule. Added FriendsData[] GetFriends(string principalID) to IFriendsData and FriendInfo[] GetFriends(string PrincipalID) to IFriendsService. Refactored some more in the FriendsModule. Made client get notification of local friends permissions upon HGLogin. HG Friends object permissions work.

1 files changed, 3 insertions, 1 deletions

diff --git a/OpenSim/Services/HypergridService/HGFriendsService.cs b/OpenSim/Services/HypergridService/HGFriendsService.cs
index fa4ec5d..3ffe889 100644
--- a/OpenSim/Services/HypergridService/HGFriendsService.cs
+++ b/OpenSim/Services/HypergridService/HGFriendsService.cs
@@ -62,7 +62,7 @@ namespace OpenSim.Services.HypergridService
             UUID userID;
             if (UUID.TryParse(PrincipalID, out userID))
             {
-                FriendsData[] friendsData = m_Database.GetFriends(userID);
+                FriendsData[] friendsData = m_Database.GetFriends(userID.ToString());
                 List<FriendsData> fList = new List<FriendsData>(friendsData);
                 if (fList.Find(delegate(FriendsData fdata)
                     {
@@ -70,6 +70,8 @@ namespace OpenSim.Services.HypergridService
                     }) != null)
                     return false;
             }
+            else
+                return false;
 
             FriendsData d = new FriendsData();
             d.PrincipalID = PrincipalID;