From 9c32b131fd0b156ada1c7e2d2107d6e1061da5e0 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 10 Sep 2011 00:57:52 +0100
Subject: Add extra log information when attachments fail validation
---
OpenSim/Region/Framework/Scenes/ScenePresence.cs | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
(limited to 'OpenSim/Region/Framework')
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index f231a39..18ad715 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -3501,8 +3501,10 @@ namespace OpenSim.Region.Framework.Scenes
///
/// This is currently just being done for information.
///
- public void ValidateAttachments()
+ public bool ValidateAttachments()
{
+ bool validated = true;
+
lock (m_attachments)
{
// Validate
@@ -3512,15 +3514,21 @@ namespace OpenSim.Region.Framework.Scenes
{
m_log.WarnFormat(
"[SCENE PRESENCE]: Failed to validate an attachment for {0} since it was null. Continuing", Name);
+
+ validated = false;
}
else if (gobj.IsDeleted)
{
m_log.WarnFormat(
"[SCENE PRESENCE]: Failed to validate attachment {0} {1} for {2} since it had been deleted. Continuing",
gobj.Name, gobj.UUID, Name);
+
+ validated = false;
}
}
}
+
+ return validated;
}
///
--
cgit v1.1