diff options
author | Melanie | 2010-02-04 10:51:36 +0000 |
---|---|---|
committer | Melanie | 2010-02-04 10:51:36 +0000 |
commit | f9a61f282500d2ac04919794c5391b98f24dd203 (patch) | |
tree | 236c76f22c91dc18774f6d540909c55283590e62 | |
parent | Commenting UserAgentService.VerifyClient(UUID sessionID, string token) for no... (diff) | |
download | opensim-SC-f9a61f282500d2ac04919794c5391b98f24dd203.zip opensim-SC-f9a61f282500d2ac04919794c5391b98f24dd203.tar.gz opensim-SC-f9a61f282500d2ac04919794c5391b98f24dd203.tar.bz2 opensim-SC-f9a61f282500d2ac04919794c5391b98f24dd203.tar.xz |
Some interface and data structure changes, add the missing method in friends
-rw-r--r-- | OpenSim/Data/IFriendsData.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | 7 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IFriendsModule.cs | 9 |
3 files changed, 17 insertions, 3 deletions
diff --git a/OpenSim/Data/IFriendsData.cs b/OpenSim/Data/IFriendsData.cs index 3ddde19..7618976 100644 --- a/OpenSim/Data/IFriendsData.cs +++ b/OpenSim/Data/IFriendsData.cs | |||
@@ -35,8 +35,8 @@ namespace OpenSim.Data | |||
35 | public class FriendsData | 35 | public class FriendsData |
36 | { | 36 | { |
37 | public UUID PrincipalID; | 37 | public UUID PrincipalID; |
38 | public string FriendID; | 38 | public string Friend; |
39 | public string Flags; | 39 | public Dictionary<string, string> Data; |
40 | } | 40 | } |
41 | 41 | ||
42 | /// <summary> | 42 | /// <summary> |
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs index a07b6e2..a9388ef 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | |||
@@ -40,7 +40,7 @@ using OpenSim.Framework.Communications; | |||
40 | using OpenSim.Region.Framework.Interfaces; | 40 | using OpenSim.Region.Framework.Interfaces; |
41 | using OpenSim.Region.Framework.Scenes; | 41 | using OpenSim.Region.Framework.Scenes; |
42 | using OpenSim.Services.Interfaces; | 42 | using OpenSim.Services.Interfaces; |
43 | using GridRegion = OpenSim.Services.Interfaces.GridRegion; | 43 | using FriendInfo = OpenSim.Region.Framework.Interfaces.FriendInfo; |
44 | 44 | ||
45 | namespace OpenSim.Region.CoreModules.Avatar.Friends | 45 | namespace OpenSim.Region.CoreModules.Avatar.Friends |
46 | { | 46 | { |
@@ -88,5 +88,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
88 | { | 88 | { |
89 | return 1; | 89 | return 1; |
90 | } | 90 | } |
91 | |||
92 | public FriendInfo[] GetFriends(UUID PrincipalID) | ||
93 | { | ||
94 | return new FriendInfo[0]; | ||
95 | } | ||
91 | } | 96 | } |
92 | } | 97 | } |
diff --git a/OpenSim/Region/Framework/Interfaces/IFriendsModule.cs b/OpenSim/Region/Framework/Interfaces/IFriendsModule.cs index 239a2ba..cab6374 100644 --- a/OpenSim/Region/Framework/Interfaces/IFriendsModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IFriendsModule.cs | |||
@@ -31,6 +31,14 @@ using System.Collections.Generic; | |||
31 | 31 | ||
32 | namespace OpenSim.Region.Framework.Interfaces | 32 | namespace OpenSim.Region.Framework.Interfaces |
33 | { | 33 | { |
34 | public struct FriendInfo | ||
35 | { | ||
36 | public UUID PrincipalID; | ||
37 | public string Friend; | ||
38 | int MyRights; | ||
39 | int TheirRights; | ||
40 | } | ||
41 | |||
34 | public interface IFriendsModule | 42 | public interface IFriendsModule |
35 | { | 43 | { |
36 | /// <summary> | 44 | /// <summary> |
@@ -47,5 +55,6 @@ namespace OpenSim.Region.Framework.Interfaces | |||
47 | /// <param name="offerMessage"></param> | 55 | /// <param name="offerMessage"></param> |
48 | void OfferFriendship(UUID fromUserId, IClientAPI toUserClient, string offerMessage); | 56 | void OfferFriendship(UUID fromUserId, IClientAPI toUserClient, string offerMessage); |
49 | uint GetFriendPerms(UUID PrincipalID, UUID FriendID); | 57 | uint GetFriendPerms(UUID PrincipalID, UUID FriendID); |
58 | FriendInfo[] GetFriends(UUID PrincipalID); | ||
50 | } | 59 | } |
51 | } | 60 | } |