aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs6
-rw-r--r--OpenSim/Region/Framework/Interfaces/IFriendsModule.cs9
-rw-r--r--OpenSim/Services/Interfaces/IFriendsService.cs49
3 files changed, 49 insertions, 15 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index a9388ef..f383bad 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -40,7 +40,6 @@ using OpenSim.Framework.Communications;
40using OpenSim.Region.Framework.Interfaces; 40using OpenSim.Region.Framework.Interfaces;
41using OpenSim.Region.Framework.Scenes; 41using OpenSim.Region.Framework.Scenes;
42using OpenSim.Services.Interfaces; 42using OpenSim.Services.Interfaces;
43using FriendInfo = OpenSim.Region.Framework.Interfaces.FriendInfo;
44 43
45namespace OpenSim.Region.CoreModules.Avatar.Friends 44namespace OpenSim.Region.CoreModules.Avatar.Friends
46{ 45{
@@ -88,10 +87,5 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
88 { 87 {
89 return 1; 88 return 1;
90 } 89 }
91
92 public FriendInfo[] GetFriends(UUID PrincipalID)
93 {
94 return new FriendInfo[0];
95 }
96 } 90 }
97} 91}
diff --git a/OpenSim/Region/Framework/Interfaces/IFriendsModule.cs b/OpenSim/Region/Framework/Interfaces/IFriendsModule.cs
index cab6374..239a2ba 100644
--- a/OpenSim/Region/Framework/Interfaces/IFriendsModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IFriendsModule.cs
@@ -31,14 +31,6 @@ using System.Collections.Generic;
31 31
32namespace OpenSim.Region.Framework.Interfaces 32namespace 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
42 public interface IFriendsModule 34 public interface IFriendsModule
43 { 35 {
44 /// <summary> 36 /// <summary>
@@ -55,6 +47,5 @@ namespace OpenSim.Region.Framework.Interfaces
55 /// <param name="offerMessage"></param> 47 /// <param name="offerMessage"></param>
56 void OfferFriendship(UUID fromUserId, IClientAPI toUserClient, string offerMessage); 48 void OfferFriendship(UUID fromUserId, IClientAPI toUserClient, string offerMessage);
57 uint GetFriendPerms(UUID PrincipalID, UUID FriendID); 49 uint GetFriendPerms(UUID PrincipalID, UUID FriendID);
58 FriendInfo[] GetFriends(UUID PrincipalID);
59 } 50 }
60} 51}
diff --git a/OpenSim/Services/Interfaces/IFriendsService.cs b/OpenSim/Services/Interfaces/IFriendsService.cs
new file mode 100644
index 0000000..ed77c1a
--- /dev/null
+++ b/OpenSim/Services/Interfaces/IFriendsService.cs
@@ -0,0 +1,49 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using OpenMetaverse;
29using OpenSim.Framework;
30using System.Collections.Generic;
31
32namespace OpenSim.Region.Framework.Interfaces
33{
34 public struct FriendInfo
35 {
36 public UUID PrincipalID;
37 public string Friend;
38 int MyRights;
39 int TheirRights;
40 }
41
42 public interface IFriendsService
43 {
44 FriendInfo[] GetFriends(UUID PrincipalID);
45 bool StoreFriend(UUID PrincipalID, string Friend, int flags);
46 bool SetFlags(UUID PrincipalID, int flags);
47 bool Delete(UUID PrincipalID, string Friend);
48 }
49}