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
---
 .../EntityTransfer/EntityTransferModule.cs         | 31 +++++++++++++---------
 .../Scripting/WorldComm/WorldCommModule.cs         |  3 ++-
 OpenSim/Region/Framework/Scenes/ScenePresence.cs   | 16 +++++------
 3 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 45506ed..ac13d5e 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -209,7 +209,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                     sp.Teleport(position);
 
                     foreach (SceneObjectGroup grp in sp.GetAttachments())
-                        sp.Scene.EventManager.TriggerOnScriptChangedEvent(grp.LocalId, (uint)Changed.TELEPORT);
+                    {
+                        if (grp.IsDeleted)
+                            sp.Scene.EventManager.TriggerOnScriptChangedEvent(grp.LocalId, (uint)Changed.TELEPORT);
+                    }
                 }
                 else // Another region possibly in another simulator
                 {
@@ -326,11 +329,11 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
                 if (sp.ParentID != (uint)0)
                     sp.StandUp();
 
-                if (!sp.ValidateAttachments())
-                {
-                    sp.ControllingClient.SendTeleportFailed("Inconsistent attachment state");
-                    return;
-                }
+//                if (!sp.ValidateAttachments())
+//                {
+//                    sp.ControllingClient.SendTeleportFailed("Inconsistent attachment state");
+//                    return;
+//                }
 
                 string reason;
                 string version;
@@ -944,8 +947,10 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
 
             Scene m_scene = agent.Scene;
 
-            if (neighbourRegion != null && agent.ValidateAttachments())
+            if (neighbourRegion != null)
             {
+                agent.ValidateAttachments();
+
                 pos = pos + (agent.Velocity);
 
                 SetInTransit(agent.UUID);
@@ -1763,16 +1768,16 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
             List<SceneObjectGroup> m_attachments = sp.GetAttachments();
 
             // Validate
-            foreach (SceneObjectGroup gobj in m_attachments)
-            {
-                if (gobj == null || gobj.IsDeleted)
-                    return false;
-            }
+//            foreach (SceneObjectGroup gobj in m_attachments)
+//            {
+//                if (gobj == null || gobj.IsDeleted)
+//                    return false;
+//            }
 
             foreach (SceneObjectGroup gobj in m_attachments)
             {
                 // If the prim group is null then something must have happened to it!
-                if (gobj != null)
+                if (gobj != null && !gobj.IsDeleted)
                 {
                     // Set the parent localID to 0 so it transfers over properly.
                     gobj.RootPart.SetParentLocalId(0);
diff --git a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
index b20a875..a14a84b 100644
--- a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
@@ -323,7 +323,8 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm
                 List<UUID> targets = new List<UUID>();
                 foreach (SceneObjectGroup sog in attachments)
                 {
-                    targets.Add(sog.UUID);
+                    if (!sog.IsDeleted)
+                        targets.Add(sog.UUID);
                 }
 
                 // Need to check each attachment
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