aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2013-07-04 10:23:20 -0700
committerDiva Canto2013-07-04 10:23:20 -0700
commit98a2fa8e358a6a008eea28161e48e4bfc877e11e (patch)
tree27c96171e49fe9bed45c8c51e2304deb20a3d622
parentHG Friends: migration #3 is failing on some installations of MySql. Setting t... (diff)
downloadopensim-SC_OLD-98a2fa8e358a6a008eea28161e48e4bfc877e11e.zip
opensim-SC_OLD-98a2fa8e358a6a008eea28161e48e4bfc877e11e.tar.gz
opensim-SC_OLD-98a2fa8e358a6a008eea28161e48e4bfc877e11e.tar.bz2
opensim-SC_OLD-98a2fa8e358a6a008eea28161e48e4bfc877e11e.tar.xz
HG Friends: this was commented some commits ago, but it shouldn't have been.
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs49
1 files changed, 24 insertions, 25 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
index ae45b99..6d1fd1f 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
@@ -348,31 +348,30 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
348 return null; 348 return null;
349 } 349 }
350 350
351// public override FriendInfo[] GetFriendsFromService(IClientAPI client) 351 public override FriendInfo[] GetFriendsFromService(IClientAPI client)
352// { 352 {
353//// m_log.DebugFormat("[HGFRIENDS MODULE]: Entering GetFriendsFromService for {0}", client.Name); 353 // m_log.DebugFormat("[HGFRIENDS MODULE]: Entering GetFriendsFromService for {0}", client.Name);
354// Boolean agentIsLocal = true; 354 Boolean agentIsLocal = true;
355// if (UserManagementModule != null) 355 if (UserManagementModule != null)
356// agentIsLocal = UserManagementModule.IsLocalGridUser(client.AgentId); 356 agentIsLocal = UserManagementModule.IsLocalGridUser(client.AgentId);
357 357
358// if (agentIsLocal) 358 if (agentIsLocal)
359// return base.GetFriendsFromService(client); 359 return base.GetFriendsFromService(client);
360 360
361// FriendInfo[] finfos = new FriendInfo[0]; 361 FriendInfo[] finfos = new FriendInfo[0];
362// // Foreigner 362 // Foreigner
363// AgentCircuitData agentClientCircuit = ((Scene)(client.Scene)).AuthenticateHandler.GetAgentCircuitData(client.CircuitCode); 363 AgentCircuitData agentClientCircuit = ((Scene)(client.Scene)).AuthenticateHandler.GetAgentCircuitData(client.CircuitCode);
364// if (agentClientCircuit != null) 364 if (agentClientCircuit != null)
365// { 365 {
366// //[XXX] string agentUUI = Util.ProduceUserUniversalIdentifier(agentClientCircuit); 366 // Note that this is calling a different interface than base; this one calls with a string param!
367 367 finfos = FriendsService.GetFriends(client.AgentId.ToString());
368// finfos = FriendsService.GetFriends(client.AgentId.ToString()); 368 m_log.DebugFormat("[HGFRIENDS MODULE]: Fetched {0} local friends for visitor {1}", finfos.Length, client.AgentId.ToString());
369// m_log.DebugFormat("[HGFRIENDS MODULE]: Fetched {0} local friends for visitor {1}", finfos.Length, client.AgentId.ToString()); 369 }
370// } 370
371 371 // m_log.DebugFormat("[HGFRIENDS MODULE]: Exiting GetFriendsFromService for {0}", client.Name);
372//// m_log.DebugFormat("[HGFRIENDS MODULE]: Exiting GetFriendsFromService for {0}", client.Name); 372
373 373 return finfos;
374// return finfos; 374 }
375// }
376 375
377 protected override bool StoreRights(UUID agentID, UUID friendID, int rights) 376 protected override bool StoreRights(UUID agentID, UUID friendID, int rights)
378 { 377 {