From ae42c93f9a2c7df4e7c14896df27544f283c8114 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 4 Jul 2013 10:59:21 -0700
Subject: Now trying to find a cause of freeze at login related to friends
 status notifications.

---
 OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs')

diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index 41ea2a2..bc501b7 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
                 if (friendSession.RegionID != UUID.Zero)
                 {
                     GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID);
-                    //m_log.DebugFormat("[FRIENDS]: Remote Notify to region {0}", region.RegionName);
-                    m_FriendsSimConnector.StatusNotify(region, userID, friendSession.UserID, online);
+                    if (region != null)
+                    {
+                        m_log.DebugFormat("[FRIENDS]: Remote Notify to region {0}", region.RegionName);
+                        m_FriendsSimConnector.StatusNotify(region, userID, friendSession.UserID, online);
+                    }
                 }
             }
         }
-- 
cgit v1.1


From 0cc0a2485c6502df096b9070ff0c8e5584dae2fd Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 4 Jul 2013 11:18:05 -0700
Subject: More debug related to the previous commit

---
 OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs')

diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index bc501b7..16a2b9b 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -526,9 +526,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
                 if (friendSession.RegionID != UUID.Zero)
                 {
                     GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID);
+                    m_log.DebugFormat("[FRIENDS]: Remote Notify to region {0}", (region == null ? "null" : region.RegionName));
                     if (region != null)
                     {
-                        m_log.DebugFormat("[FRIENDS]: Remote Notify to region {0}", region.RegionName);
                         m_FriendsSimConnector.StatusNotify(region, userID, friendSession.UserID, online);
                     }
                 }
-- 
cgit v1.1


From ec9ffbb89a8925cebae29d9950475eaa1b280de4 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 4 Jul 2013 11:36:10 -0700
Subject: More debug, same issue

---
 OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs')

diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index 16a2b9b..ea69abb 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -523,15 +523,17 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
             foreach (PresenceInfo friendSession in friendSessions)
             {
                 // let's guard against sessions-gone-bad
-                if (friendSession.RegionID != UUID.Zero)
+                if (friendSession != null && friendSession.RegionID != UUID.Zero)
                 {
+                    m_log.DebugFormat("[FRIENDS]: Get region {0}", friendSession.RegionID);
                     GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID);
-                    m_log.DebugFormat("[FRIENDS]: Remote Notify to region {0}", (region == null ? "null" : region.RegionName));
                     if (region != null)
                     {
                         m_FriendsSimConnector.StatusNotify(region, userID, friendSession.UserID, online);
                     }
                 }
+                else
+                    m_log.DebugFormat("[FRIENDS]: friend session is null or the region is UUID.Zero");
             }
         }
 
-- 
cgit v1.1


From bf214122cddf62b46d6074755b08a3b0acef853f Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 4 Jul 2013 11:53:22 -0700
Subject: More debug, same issue

---
 OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs')

diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index ea69abb..6d4c65d 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -498,6 +498,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
 
         protected virtual void StatusNotify(List<FriendInfo> friendList, UUID userID, bool online)
         {
+            m_log.DebugFormat("[FRIENDS]: Entering StatusNotify for {0}", userID);
+
             List<string> friendStringIds = friendList.ConvertAll<string>(friend => friend.Friend);
             List<string> remoteFriendStringIds = new List<string>();
             foreach (string friendStringId in friendStringIds)
-- 
cgit v1.1