aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-08-22 23:28:37 +0100
committerJustin Clark-Casey (justincc)2011-08-22 23:28:37 +0100
commit2eaadf2dc0459aa4fc2d7cf7de510213ff31c543 (patch)
tree098d5d87cf27bb4240c43af016f9d8f45f309d47
parentminor: remove mono compiler warning (diff)
downloadopensim-SC_OLD-2eaadf2dc0459aa4fc2d7cf7de510213ff31c543.zip
opensim-SC_OLD-2eaadf2dc0459aa4fc2d7cf7de510213ff31c543.tar.gz
opensim-SC_OLD-2eaadf2dc0459aa4fc2d7cf7de510213ff31c543.tar.bz2
opensim-SC_OLD-2eaadf2dc0459aa4fc2d7cf7de510213ff31c543.tar.xz
Add warning log message to say which attachment fails validation in order to pin down problems with "Inconsistent Attachment State"
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs10
1 files changed, 10 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 719f2da..53c3b85 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3525,12 +3525,22 @@ namespace OpenSim.Region.Framework.Scenes
3525 foreach (SceneObjectGroup gobj in m_attachments) 3525 foreach (SceneObjectGroup gobj in m_attachments)
3526 { 3526 {
3527 if (gobj == null) 3527 if (gobj == null)
3528 {
3529 m_log.WarnFormat(
3530 "[SCENE PRESENCE]: Failed to validate an attachment for {0} since it was null", Name);
3528 return false; 3531 return false;
3532 }
3529 3533
3530 if (gobj.IsDeleted) 3534 if (gobj.IsDeleted)
3535 {
3536 m_log.WarnFormat(
3537 "[SCENE PRESENCE]: Failed to validate attachment {0} {1} for {2} since it had been deleted",
3538 gobj.Name, gobj.UUID, Name);
3531 return false; 3539 return false;
3540 }
3532 } 3541 }
3533 } 3542 }
3543
3534 return true; 3544 return true;
3535 } 3545 }
3536 3546