From cf73afec356eed30e169be3ce71edad89b4fdb37 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 5 Sep 2011 23:42:37 +0100
Subject: Try disabling the inconsistent attachment state check to see if this
 actually has an impact.

The code in question is over three years old and just be catching an inconsistency rather than being wholly necessary.
This commit still carries out the check and prints all the previous log warnings but a 'failure' no longer prevents avatar region crossing or teleport, and it doesn't give the client the error message.
This will have some kind of impact on http://opensimulator.org/mantis/view.php?id=5672
---
 OpenSim/Region/Framework/Scenes/ScenePresence.cs | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'OpenSim/Region/Framework/Scenes')

diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 1c283c7..f231a39 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3498,7 +3498,10 @@ namespace OpenSim.Region.Framework.Scenes
                 m_attachments.Clear();
         }
 
-        public bool ValidateAttachments()
+        /// <summary>
+        /// This is currently just being done for information.
+        /// </summary>
+        public void ValidateAttachments()
         {
             lock (m_attachments)
             {
@@ -3508,21 +3511,16 @@ namespace OpenSim.Region.Framework.Scenes
                     if (gobj == null)
                     {
                         m_log.WarnFormat(
-                            "[SCENE PRESENCE]: Failed to validate an attachment for {0} since it was null", Name);
-                        return false;
+                            "[SCENE PRESENCE]: Failed to validate an attachment for {0} since it was null.  Continuing", Name);
                     }
-
-                    if (gobj.IsDeleted)
+                    else if (gobj.IsDeleted)
                     {
                         m_log.WarnFormat(
-                            "[SCENE PRESENCE]: Failed to validate attachment {0} {1} for {2} since it had been deleted",
+                            "[SCENE PRESENCE]: Failed to validate attachment {0} {1} for {2} since it had been deleted.  Continuing",
                             gobj.Name, gobj.UUID, Name);
-                        return false;
                     }
                 }
             }
-
-            return true;
         }
 
         /// <summary>
-- 
cgit v1.1