diff options
author | Justin Clark-Casey (justincc) | 2011-11-16 00:26:54 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-11-16 00:26:54 +0000 |
commit | e21949deaf00b409c16fca8ccf0ea9f27e8c1969 (patch) | |
tree | 149dd6adbb290537743a08318013ede3faa17254 /OpenSim/Region/CoreModules | |
parent | Fix the build break (diff) | |
download | opensim-SC_OLD-e21949deaf00b409c16fca8ccf0ea9f27e8c1969.zip opensim-SC_OLD-e21949deaf00b409c16fca8ccf0ea9f27e8c1969.tar.gz opensim-SC_OLD-e21949deaf00b409c16fca8ccf0ea9f27e8c1969.tar.bz2 opensim-SC_OLD-e21949deaf00b409c16fca8ccf0ea9f27e8c1969.tar.xz |
Comment out the vebose logging on HGFriendsModule.
Recent issues in http://opensimulator.org/mantis/view.php?id=5794 were not related to HG friends
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs index 75c0183..9a97925 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs | |||
@@ -85,7 +85,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
85 | 85 | ||
86 | protected override bool CacheFriends(IClientAPI client) | 86 | protected override bool CacheFriends(IClientAPI client) |
87 | { | 87 | { |
88 | m_log.DebugFormat("[HGFRIENDS MODULE]: Entered CacheFriends for {0}", client.Name); | 88 | // m_log.DebugFormat("[HGFRIENDS MODULE]: Entered CacheFriends for {0}", client.Name); |
89 | 89 | ||
90 | if (base.CacheFriends(client)) | 90 | if (base.CacheFriends(client)) |
91 | { | 91 | { |
@@ -112,18 +112,18 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
112 | } | 112 | } |
113 | } | 113 | } |
114 | 114 | ||
115 | m_log.DebugFormat("[HGFRIENDS MODULE]: Exiting CacheFriends for {0} since detected root agent", client.Name); | 115 | // m_log.DebugFormat("[HGFRIENDS MODULE]: Exiting CacheFriends for {0} since detected root agent", client.Name); |
116 | return true; | 116 | return true; |
117 | } | 117 | } |
118 | } | 118 | } |
119 | 119 | ||
120 | m_log.DebugFormat("[HGFRIENDS MODULE]: Exiting CacheFriends for {0} since detected not root agent", client.Name); | 120 | // m_log.DebugFormat("[HGFRIENDS MODULE]: Exiting CacheFriends for {0} since detected not root agent", client.Name); |
121 | return false; | 121 | return false; |
122 | } | 122 | } |
123 | 123 | ||
124 | public override bool SendFriendsOnlineIfNeeded(IClientAPI client) | 124 | public override bool SendFriendsOnlineIfNeeded(IClientAPI client) |
125 | { | 125 | { |
126 | m_log.DebugFormat("[HGFRIENDS MODULE]: Entering SendFriendsOnlineIfNeeded for {0}", client.Name); | 126 | // m_log.DebugFormat("[HGFRIENDS MODULE]: Entering SendFriendsOnlineIfNeeded for {0}", client.Name); |
127 | 127 | ||
128 | if (base.SendFriendsOnlineIfNeeded(client)) | 128 | if (base.SendFriendsOnlineIfNeeded(client)) |
129 | { | 129 | { |
@@ -142,13 +142,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
142 | } | 142 | } |
143 | } | 143 | } |
144 | 144 | ||
145 | m_log.DebugFormat("[HGFRIENDS MODULE]: Exiting SendFriendsOnlineIfNeeded for {0}", client.Name); | 145 | // m_log.DebugFormat("[HGFRIENDS MODULE]: Exiting SendFriendsOnlineIfNeeded for {0}", client.Name); |
146 | return false; | 146 | return false; |
147 | } | 147 | } |
148 | 148 | ||
149 | protected override void GetOnlineFriends(UUID userID, List<string> friendList, /*collector*/ List<UUID> online) | 149 | protected override void GetOnlineFriends(UUID userID, List<string> friendList, /*collector*/ List<UUID> online) |
150 | { | 150 | { |
151 | m_log.DebugFormat("[HGFRIENDS MODULE]: Entering GetOnlineFriends for {0}", userID); | 151 | // m_log.DebugFormat("[HGFRIENDS MODULE]: Entering GetOnlineFriends for {0}", userID); |
152 | 152 | ||
153 | List<string> fList = new List<string>(); | 153 | List<string> fList = new List<string>(); |
154 | foreach (string s in friendList) | 154 | foreach (string s in friendList) |
@@ -169,7 +169,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
169 | online.Add(presenceID); | 169 | online.Add(presenceID); |
170 | } | 170 | } |
171 | 171 | ||
172 | m_log.DebugFormat("[HGFRIENDS MODULE]: Exiting GetOnlineFriends for {0}", userID); | 172 | // m_log.DebugFormat("[HGFRIENDS MODULE]: Exiting GetOnlineFriends for {0}", userID); |
173 | } | 173 | } |
174 | 174 | ||
175 | //protected override void GetOnlineFriends(UUID userID, List<string> friendList, /*collector*/ List<UUID> online) | 175 | //protected override void GetOnlineFriends(UUID userID, List<string> friendList, /*collector*/ List<UUID> online) |
@@ -259,7 +259,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
259 | 259 | ||
260 | protected override void StatusNotify(List<FriendInfo> friendList, UUID userID, bool online) | 260 | protected override void StatusNotify(List<FriendInfo> friendList, UUID userID, bool online) |
261 | { | 261 | { |
262 | m_log.DebugFormat("[HGFRIENDS MODULE]: Entering StatusNotify for {0}", userID); | 262 | // m_log.DebugFormat("[HGFRIENDS MODULE]: Entering StatusNotify for {0}", userID); |
263 | 263 | ||
264 | // First, let's divide the friends on a per-domain basis | 264 | // First, let's divide the friends on a per-domain basis |
265 | Dictionary<string, List<FriendInfo>> friendsPerDomain = new Dictionary<string, List<FriendInfo>>(); | 265 | Dictionary<string, List<FriendInfo>> friendsPerDomain = new Dictionary<string, List<FriendInfo>>(); |
@@ -314,7 +314,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
314 | } | 314 | } |
315 | } | 315 | } |
316 | 316 | ||
317 | m_log.DebugFormat("[HGFRIENDS MODULE]: Exiting StatusNotify for {0}", userID); | 317 | // m_log.DebugFormat("[HGFRIENDS MODULE]: Exiting StatusNotify for {0}", userID); |
318 | } | 318 | } |
319 | 319 | ||
320 | protected override bool GetAgentInfo(UUID scopeID, string fid, out UUID agentID, out string first, out string last) | 320 | protected override bool GetAgentInfo(UUID scopeID, string fid, out UUID agentID, out string first, out string last) |
@@ -368,7 +368,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
368 | 368 | ||
369 | protected override FriendInfo[] GetFriendsFromService(IClientAPI client) | 369 | protected override FriendInfo[] GetFriendsFromService(IClientAPI client) |
370 | { | 370 | { |
371 | m_log.DebugFormat("[HGFRIENDS MODULE]: Entering GetFriendsFromService for {0}", client.Name); | 371 | // m_log.DebugFormat("[HGFRIENDS MODULE]: Entering GetFriendsFromService for {0}", client.Name); |
372 | 372 | ||
373 | UserAccount account1 = UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, client.AgentId); | 373 | UserAccount account1 = UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, client.AgentId); |
374 | if (account1 != null) | 374 | if (account1 != null) |
@@ -385,7 +385,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
385 | m_log.DebugFormat("[HGFRIENDS MODULE]: Fetched {0} local friends for visitor {1}", finfos.Length, agentUUI); | 385 | m_log.DebugFormat("[HGFRIENDS MODULE]: Fetched {0} local friends for visitor {1}", finfos.Length, agentUUI); |
386 | } | 386 | } |
387 | 387 | ||
388 | m_log.DebugFormat("[HGFRIENDS MODULE]: Exiting GetFriendsFromService for {0}", client.Name); | 388 | // m_log.DebugFormat("[HGFRIENDS MODULE]: Exiting GetFriendsFromService for {0}", client.Name); |
389 | 389 | ||
390 | return finfos; | 390 | return finfos; |
391 | } | 391 | } |
@@ -423,7 +423,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
423 | } | 423 | } |
424 | 424 | ||
425 | return false; | 425 | return false; |
426 | |||
427 | } | 426 | } |
428 | 427 | ||
429 | protected override void StoreBackwards(UUID friendID, UUID agentID) | 428 | protected override void StoreBackwards(UUID friendID, UUID agentID) |