From 0ab8dd61d787e2ed04cf0fd473be8ea6a97ec8d0 Mon Sep 17 00:00:00 2001 From: Melanie Date: Thu, 4 Feb 2010 12:21:14 +0000 Subject: Finally cutting the gordian knot. Friends needs to be both a module and a service, and never the twain shall meet. This finally opens up the path to a working friends implementation --- .../CoreModules/Avatar/Friends/FriendsModule.cs | 6 --- .../Region/Framework/Interfaces/IFriendsModule.cs | 9 ---- OpenSim/Services/Interfaces/IFriendsService.cs | 49 ++++++++++++++++++++++ 3 files changed, 49 insertions(+), 15 deletions(-) create mode 100644 OpenSim/Services/Interfaces/IFriendsService.cs 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; using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Scenes; using OpenSim.Services.Interfaces; -using FriendInfo = OpenSim.Region.Framework.Interfaces.FriendInfo; namespace OpenSim.Region.CoreModules.Avatar.Friends { @@ -88,10 +87,5 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends { return 1; } - - public FriendInfo[] GetFriends(UUID PrincipalID) - { - return new FriendInfo[0]; - } } } 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; namespace OpenSim.Region.Framework.Interfaces { - public struct FriendInfo - { - public UUID PrincipalID; - public string Friend; - int MyRights; - int TheirRights; - } - public interface IFriendsModule { /// @@ -55,6 +47,5 @@ namespace OpenSim.Region.Framework.Interfaces /// void OfferFriendship(UUID fromUserId, IClientAPI toUserClient, string offerMessage); uint GetFriendPerms(UUID PrincipalID, UUID FriendID); - FriendInfo[] GetFriends(UUID PrincipalID); } } 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 @@ +/* + * Copyright (c) Contributors, http://opensimulator.org/ + * See CONTRIBUTORS.TXT for a full list of copyright holders. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * * Neither the name of the OpenSimulator Project nor the + * names of its contributors may be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +using OpenMetaverse; +using OpenSim.Framework; +using System.Collections.Generic; + +namespace OpenSim.Region.Framework.Interfaces +{ + public struct FriendInfo + { + public UUID PrincipalID; + public string Friend; + int MyRights; + int TheirRights; + } + + public interface IFriendsService + { + FriendInfo[] GetFriends(UUID PrincipalID); + bool StoreFriend(UUID PrincipalID, string Friend, int flags); + bool SetFlags(UUID PrincipalID, int flags); + bool Delete(UUID PrincipalID, string Friend); + } +} -- cgit v1.1