aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorDiva Canto2010-03-01 21:32:55 -0800
committerDiva Canto2010-03-01 21:32:55 -0800
commitc6a5ff26fff6a1d0c3ab916a526cf0dd4e4142bc (patch)
tree3dcf44addbc232a86e16c6732aaabe3b76a28c71 /OpenSim/Services
parentMore work on GrantRights. Still not right. (diff)
downloadopensim-SC-c6a5ff26fff6a1d0c3ab916a526cf0dd4e4142bc.zip
opensim-SC-c6a5ff26fff6a1d0c3ab916a526cf0dd4e4142bc.tar.gz
opensim-SC-c6a5ff26fff6a1d0c3ab916a526cf0dd4e4142bc.tar.bz2
opensim-SC-c6a5ff26fff6a1d0c3ab916a526cf0dd4e4142bc.tar.xz
Friends rights under control.
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs4
-rw-r--r--OpenSim/Services/Interfaces/IFriendsService.cs6
2 files changed, 8 insertions, 2 deletions
diff --git a/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs b/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
index 490c8cf..a29ac28 100644
--- a/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
+++ b/OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
@@ -99,7 +99,7 @@ namespace OpenSim.Services.Connectors.Friends
99 return Call(region, sendData); 99 return Call(region, sendData);
100 } 100 }
101 101
102 public bool GrantRights(GridRegion region, UUID userID, UUID friendID) 102 public bool GrantRights(GridRegion region, UUID userID, UUID friendID, int userFlags, int rights)
103 { 103 {
104 Dictionary<string, object> sendData = new Dictionary<string, object>(); 104 Dictionary<string, object> sendData = new Dictionary<string, object>();
105 //sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString(); 105 //sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString();
@@ -108,6 +108,8 @@ namespace OpenSim.Services.Connectors.Friends
108 108
109 sendData["FromID"] = userID.ToString(); 109 sendData["FromID"] = userID.ToString();
110 sendData["ToID"] = friendID.ToString(); 110 sendData["ToID"] = friendID.ToString();
111 sendData["UserFlags"] = userFlags.ToString();
112 sendData["Rights"] = rights.ToString();
111 113
112 return Call(region, sendData); 114 return Call(region, sendData);
113 } 115 }
diff --git a/OpenSim/Services/Interfaces/IFriendsService.cs b/OpenSim/Services/Interfaces/IFriendsService.cs
index fc20224..2692c48 100644
--- a/OpenSim/Services/Interfaces/IFriendsService.cs
+++ b/OpenSim/Services/Interfaces/IFriendsService.cs
@@ -32,13 +32,17 @@ using System.Collections.Generic;
32 32
33namespace OpenSim.Services.Interfaces 33namespace OpenSim.Services.Interfaces
34{ 34{
35 public struct FriendInfo 35 public class FriendInfo
36 { 36 {
37 public UUID PrincipalID; 37 public UUID PrincipalID;
38 public string Friend; 38 public string Friend;
39 public int MyFlags; 39 public int MyFlags;
40 public int TheirFlags; 40 public int TheirFlags;
41 41
42 public FriendInfo()
43 {
44 }
45
42 public FriendInfo(Dictionary<string, object> kvp) 46 public FriendInfo(Dictionary<string, object> kvp)
43 { 47 {
44 PrincipalID = UUID.Zero; 48 PrincipalID = UUID.Zero;