aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/Friends
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-11-15 22:14:31 +0000
committerJustin Clark-Casey (justincc)2011-11-15 22:14:31 +0000
commit122304317cff1218e786855073b857af8a85f65a (patch)
tree2e070b3912fb3e670337f17591a8295d08bf5ad9 /OpenSim/Region/CoreModules/Avatar/Friends
parentdistinguish between FriendsSimConnector and FriendsServiceConnector in log (diff)
downloadopensim-SC_OLD-122304317cff1218e786855073b857af8a85f65a.zip
opensim-SC_OLD-122304317cff1218e786855073b857af8a85f65a.tar.gz
opensim-SC_OLD-122304317cff1218e786855073b857af8a85f65a.tar.bz2
opensim-SC_OLD-122304317cff1218e786855073b857af8a85f65a.tar.xz
temporarily increasing logging in HGFriendsModule for debugging
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Friends')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs25
1 files changed, 24 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
index 56bba75..75c0183 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
@@ -85,6 +85,8 @@ 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);
89
88 if (base.CacheFriends(client)) 90 if (base.CacheFriends(client))
89 { 91 {
90 UUID agentID = client.AgentId; 92 UUID agentID = client.AgentId;
@@ -109,14 +111,20 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
109 } 111 }
110 } 112 }
111 } 113 }
114
115 m_log.DebugFormat("[HGFRIENDS MODULE]: Exiting CacheFriends for {0} since detected root agent", client.Name);
112 return true; 116 return true;
113 } 117 }
114 } 118 }
119
120 m_log.DebugFormat("[HGFRIENDS MODULE]: Exiting CacheFriends for {0} since detected not root agent", client.Name);
115 return false; 121 return false;
116 } 122 }
117 123
118 public override bool SendFriendsOnlineIfNeeded(IClientAPI client) 124 public override bool SendFriendsOnlineIfNeeded(IClientAPI client)
119 { 125 {
126 m_log.DebugFormat("[HGFRIENDS MODULE]: Entering SendFriendsOnlineIfNeeded for {0}", client.Name);
127
120 if (base.SendFriendsOnlineIfNeeded(client)) 128 if (base.SendFriendsOnlineIfNeeded(client))
121 { 129 {
122 AgentCircuitData aCircuit = ((Scene)client.Scene).AuthenticateHandler.GetAgentCircuitData(client.AgentId); 130 AgentCircuitData aCircuit = ((Scene)client.Scene).AuthenticateHandler.GetAgentCircuitData(client.AgentId);
@@ -133,11 +141,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
133 } 141 }
134 } 142 }
135 } 143 }
144
145 m_log.DebugFormat("[HGFRIENDS MODULE]: Exiting SendFriendsOnlineIfNeeded for {0}", client.Name);
136 return false; 146 return false;
137 } 147 }
138 148
139 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)
140 { 150 {
151 m_log.DebugFormat("[HGFRIENDS MODULE]: Entering GetOnlineFriends for {0}", userID);
152
141 List<string> fList = new List<string>(); 153 List<string> fList = new List<string>();
142 foreach (string s in friendList) 154 foreach (string s in friendList)
143 { 155 {
@@ -156,6 +168,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
156 if (UUID.TryParse(pi.UserID, out presenceID)) 168 if (UUID.TryParse(pi.UserID, out presenceID))
157 online.Add(presenceID); 169 online.Add(presenceID);
158 } 170 }
171
172 m_log.DebugFormat("[HGFRIENDS MODULE]: Exiting GetOnlineFriends for {0}", userID);
159 } 173 }
160 174
161 //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)
@@ -245,6 +259,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
245 259
246 protected override void StatusNotify(List<FriendInfo> friendList, UUID userID, bool online) 260 protected override void StatusNotify(List<FriendInfo> friendList, UUID userID, bool online)
247 { 261 {
262 m_log.DebugFormat("[HGFRIENDS MODULE]: Entering StatusNotify for {0}", userID);
263
248 // First, let's divide the friends on a per-domain basis 264 // First, let's divide the friends on a per-domain basis
249 Dictionary<string, List<FriendInfo>> friendsPerDomain = new Dictionary<string, List<FriendInfo>>(); 265 Dictionary<string, List<FriendInfo>> friendsPerDomain = new Dictionary<string, List<FriendInfo>>();
250 foreach (FriendInfo friend in friendList) 266 foreach (FriendInfo friend in friendList)
@@ -297,6 +313,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
297 } 313 }
298 } 314 }
299 } 315 }
316
317 m_log.DebugFormat("[HGFRIENDS MODULE]: Exiting StatusNotify for {0}", userID);
300 } 318 }
301 319
302 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)
@@ -350,6 +368,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
350 368
351 protected override FriendInfo[] GetFriendsFromService(IClientAPI client) 369 protected override FriendInfo[] GetFriendsFromService(IClientAPI client)
352 { 370 {
371 m_log.DebugFormat("[HGFRIENDS MODULE]: Entering GetFriendsFromService for {0}", client.Name);
372
353 UserAccount account1 = UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, client.AgentId); 373 UserAccount account1 = UserAccountService.GetUserAccount(m_Scenes[0].RegionInfo.ScopeID, client.AgentId);
354 if (account1 != null) 374 if (account1 != null)
355 return base.GetFriendsFromService(client); 375 return base.GetFriendsFromService(client);
@@ -364,6 +384,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
364 finfos = FriendsService.GetFriends(agentUUI); 384 finfos = FriendsService.GetFriends(agentUUI);
365 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);
366 } 386 }
387
388 m_log.DebugFormat("[HGFRIENDS MODULE]: Exiting GetFriendsFromService for {0}", client.Name);
389
367 return finfos; 390 return finfos;
368 } 391 }
369 392
@@ -626,4 +649,4 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
626 } 649 }
627 } 650 }
628 } 651 }
629} 652} \ No newline at end of file