aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-07-04 19:33:12 +0100
committerJustin Clark-Casey (justincc)2013-07-04 19:33:12 +0100
commitc61becc62b2d36996350e8837424bc847532eb4c (patch)
treea1cc42425c1acdaefe6cc7a5094646d8802d526b
parentAdd --default option to "debug lludp packet" command to allow packet logging ... (diff)
parentMore debug related to the previous commit (diff)
downloadopensim-SC_OLD-c61becc62b2d36996350e8837424bc847532eb4c.zip
opensim-SC_OLD-c61becc62b2d36996350e8837424bc847532eb4c.tar.gz
opensim-SC_OLD-c61becc62b2d36996350e8837424bc847532eb4c.tar.bz2
opensim-SC_OLD-c61becc62b2d36996350e8837424bc847532eb4c.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
-rw-r--r--OpenSim/Data/MySQL/Resources/FriendsStore.migrations2
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs7
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs49
3 files changed, 30 insertions, 28 deletions
diff --git a/OpenSim/Data/MySQL/Resources/FriendsStore.migrations b/OpenSim/Data/MySQL/Resources/FriendsStore.migrations
index 55d82ec..5faf956 100644
--- a/OpenSim/Data/MySQL/Resources/FriendsStore.migrations
+++ b/OpenSim/Data/MySQL/Resources/FriendsStore.migrations
@@ -9,7 +9,7 @@ CREATE TABLE `Friends` (
9 `Offered` VARCHAR(32) NOT NULL DEFAULT 0, 9 `Offered` VARCHAR(32) NOT NULL DEFAULT 0,
10 PRIMARY KEY(`PrincipalID`, `Friend`), 10 PRIMARY KEY(`PrincipalID`, `Friend`),
11 KEY(`PrincipalID`) 11 KEY(`PrincipalID`)
12); 12) ENGINE=InnoDB;
13 13
14COMMIT; 14COMMIT;
15 15
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index 41ea2a2..16a2b9b 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -526,8 +526,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
526 if (friendSession.RegionID != UUID.Zero) 526 if (friendSession.RegionID != UUID.Zero)
527 { 527 {
528 GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID); 528 GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID);
529 //m_log.DebugFormat("[FRIENDS]: Remote Notify to region {0}", region.RegionName); 529 m_log.DebugFormat("[FRIENDS]: Remote Notify to region {0}", (region == null ? "null" : region.RegionName));
530 m_FriendsSimConnector.StatusNotify(region, userID, friendSession.UserID, online); 530 if (region != null)
531 {
532 m_FriendsSimConnector.StatusNotify(region, userID, friendSession.UserID, online);
533 }
531 } 534 }
532 } 535 }
533 } 536 }
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 {