Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Tests/Common/Mock/TestClient.cs

1 files changed, 9 insertions, 1 deletions

diff --git a/OpenSim/Services/Interfaces/IFriendsService.cs b/OpenSim/Services/Interfaces/IFriendsService.cs
index 1664f3b..d0d3b10 100644
--- a/OpenSim/Services/Interfaces/IFriendsService.cs
+++ b/OpenSim/Services/Interfaces/IFriendsService.cs
@@ -36,7 +36,15 @@ namespace OpenSim.Services.Interfaces
     {
         public UUID PrincipalID;
         public string Friend;
+
+        /// <summary>
+        /// The permissions that this user has granted to the friend.
+        /// </summary>
         public int MyFlags;
+
+        /// <summary>
+        /// The permissions that the friend has granted to this user.
+        /// </summary>
         public int TheirFlags;
 
         public FriendInfo()
@@ -51,7 +59,7 @@ namespace OpenSim.Services.Interfaces
             Friend = string.Empty;
             if (kvp.ContainsKey("Friend") && kvp["Friend"] != null)
                 Friend = kvp["Friend"].ToString();
-            MyFlags = 0;
+            MyFlags = (int)FriendRights.None;
             if (kvp.ContainsKey("MyFlags") && kvp["MyFlags"] != null)
                 Int32.TryParse(kvp["MyFlags"].ToString(), out MyFlags);
             TheirFlags = 0;