diff options
author | Diva Canto | 2013-07-04 09:17:01 -0700 |
---|---|---|
committer | Diva Canto | 2013-07-04 09:17:01 -0700 |
commit | 5eb78aad96f2dbaf7c4c0e5fa7e678076a2edbfc (patch) | |
tree | eacc3e7e0384915c2b9595568f2cf49f42b9f61d | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC-5eb78aad96f2dbaf7c4c0e5fa7e678076a2edbfc.zip opensim-SC-5eb78aad96f2dbaf7c4c0e5fa7e678076a2edbfc.tar.gz opensim-SC-5eb78aad96f2dbaf7c4c0e5fa7e678076a2edbfc.tar.bz2 opensim-SC-5eb78aad96f2dbaf7c4c0e5fa7e678076a2edbfc.tar.xz |
Revert "HG Friends: debug an issue where the friends data stored in the DB is incomplete."
This reverts commit 27cdfb7b840423cf8cee08988dc487eeb34d71c7.
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs | 1 | ||||
-rw-r--r-- | OpenSim/Services/Friends/FriendsService.cs | 9 |
2 files changed, 1 insertions, 9 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs index d8f7dc9..ae45b99 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs | |||
@@ -546,7 +546,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
546 | FriendsService.StoreFriend(agentID.ToString(), theFriendUUID, 1); | 546 | FriendsService.StoreFriend(agentID.ToString(), theFriendUUID, 1); |
547 | // and also the converse | 547 | // and also the converse |
548 | FriendsService.StoreFriend(theFriendUUID, agentID.ToString(), 1); | 548 | FriendsService.StoreFriend(theFriendUUID, agentID.ToString(), 1); |
549 | m_log.DebugFormat("[HGFRIENDS MODULE]: Stored {0} {01}", agentID, theFriendUUID); | ||
550 | 549 | ||
551 | //if (!confirming) | 550 | //if (!confirming) |
552 | //{ | 551 | //{ |
diff --git a/OpenSim/Services/Friends/FriendsService.cs b/OpenSim/Services/Friends/FriendsService.cs index dd3f733..e2033ac 100644 --- a/OpenSim/Services/Friends/FriendsService.cs +++ b/OpenSim/Services/Friends/FriendsService.cs | |||
@@ -29,7 +29,6 @@ using OpenMetaverse; | |||
29 | using OpenSim.Framework; | 29 | using OpenSim.Framework; |
30 | using System; | 30 | using System; |
31 | using System.Collections.Generic; | 31 | using System.Collections.Generic; |
32 | using System.Reflection; | ||
33 | using OpenSim.Services.Interfaces; | 32 | using OpenSim.Services.Interfaces; |
34 | using OpenSim.Data; | 33 | using OpenSim.Data; |
35 | using Nini.Config; | 34 | using Nini.Config; |
@@ -40,12 +39,7 @@ namespace OpenSim.Services.Friends | |||
40 | { | 39 | { |
41 | public class FriendsService : FriendsServiceBase, IFriendsService | 40 | public class FriendsService : FriendsServiceBase, IFriendsService |
42 | { | 41 | { |
43 | private static readonly ILog m_log = | 42 | public FriendsService(IConfigSource config) : base(config) |
44 | LogManager.GetLogger( | ||
45 | MethodBase.GetCurrentMethod().DeclaringType); | ||
46 | |||
47 | public FriendsService(IConfigSource config) | ||
48 | : base(config) | ||
49 | { | 43 | { |
50 | } | 44 | } |
51 | 45 | ||
@@ -104,7 +98,6 @@ namespace OpenSim.Services.Friends | |||
104 | d.Data = new Dictionary<string, string>(); | 98 | d.Data = new Dictionary<string, string>(); |
105 | d.Data["Flags"] = flags.ToString(); | 99 | d.Data["Flags"] = flags.ToString(); |
106 | 100 | ||
107 | m_log.DebugFormat("[FRIENDS]: Storing {0} {1}", PrincipalID, Friend); | ||
108 | return m_Database.Store(d); | 101 | return m_Database.Store(d); |
109 | } | 102 | } |
110 | 103 | ||