aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-03-30 00:40:19 +0100
committerJustin Clark-Casey (justincc)2012-03-30 00:42:55 +0100
commit59157d9d63c0e038ca0a619bfae1be3ed6f77677 (patch)
tree76e7ba7de91aedad887a6ac0633598d53ce30df3 /OpenSim/Services
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-59157d9d63c0e038ca0a619bfae1be3ed6f77677.zip
opensim-SC_OLD-59157d9d63c0e038ca0a619bfae1be3ed6f77677.tar.gz
opensim-SC_OLD-59157d9d63c0e038ca0a619bfae1be3ed6f77677.tar.bz2
opensim-SC_OLD-59157d9d63c0e038ca0a619bfae1be3ed6f77677.tar.xz
Add simple login test with online friends. Add IFriendsModule.GrantRights() for granting rights via a module call.
Rename IFriendsModule.GetFriendPerms() -> GetRightsGrantedByFriend() to be more self-documenting and consistent with friends module terminology. Add some method doc.
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/Interfaces/IFriendsService.cs8
-rw-r--r--OpenSim/Services/PresenceService/PresenceService.cs7
2 files changed, 12 insertions, 3 deletions
diff --git a/OpenSim/Services/Interfaces/IFriendsService.cs b/OpenSim/Services/Interfaces/IFriendsService.cs
index fe94242..d0d3b10 100644
--- a/OpenSim/Services/Interfaces/IFriendsService.cs
+++ b/OpenSim/Services/Interfaces/IFriendsService.cs
@@ -36,7 +36,15 @@ namespace OpenSim.Services.Interfaces
36 { 36 {
37 public UUID PrincipalID; 37 public UUID PrincipalID;
38 public string Friend; 38 public string Friend;
39
40 /// <summary>
41 /// The permissions that this user has granted to the friend.
42 /// </summary>
39 public int MyFlags; 43 public int MyFlags;
44
45 /// <summary>
46 /// The permissions that the friend has granted to this user.
47 /// </summary>
40 public int TheirFlags; 48 public int TheirFlags;
41 49
42 public FriendInfo() 50 public FriendInfo()
diff --git a/OpenSim/Services/PresenceService/PresenceService.cs b/OpenSim/Services/PresenceService/PresenceService.cs
index c8ac38e..ed2703e 100644
--- a/OpenSim/Services/PresenceService/PresenceService.cs
+++ b/OpenSim/Services/PresenceService/PresenceService.cs
@@ -151,11 +151,12 @@ namespace OpenSim.Services.PresenceService
151 151
152 info.Add(ret); 152 info.Add(ret);
153 } 153 }
154
155// m_log.DebugFormat(
156// "[PRESENCE SERVICE]: GetAgents for {0} found {1} presences", userIDStr, data.Length);
154 } 157 }
155 158
156 // m_log.DebugFormat("[PRESENCE SERVICE]: GetAgents for {0} userIDs found {1} presences", userIDs.Length, info.Count);
157 return info.ToArray(); 159 return info.ToArray();
158 } 160 }
159
160 } 161 }
161} 162} \ No newline at end of file