1 files changed, 8 insertions, 1 deletions

diff --git a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
index dd6a92e..9078a14 100644
--- a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs
@@ -256,6 +256,13 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends
                             // prevents a sim crash.
                             m_log.Info("[FRIEND]: Unable to enumerate last friendlist user.  User logged off");
                         }
+                        catch (ArgumentOutOfRangeException)
+                        {
+                            // Ignore the index out of range exception.  
+                            // This causes friend lists to get out of sync slightly..  however
+                            // prevents a sim crash.
+                            m_log.Info("[FRIEND]: Unable to enumerate last friendlist user.  User logged off");
+                        }
                     }
                 }
 
@@ -498,4 +505,4 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends
 
         #endregion
     }
-}
\ No newline at end of file
+}