diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 10 |
1 files changed, 9 insertions, 1 deletions
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 | |||
3501 | /// <summary> | 3501 | /// <summary> |
3502 | /// This is currently just being done for information. | 3502 | /// This is currently just being done for information. |
3503 | /// </summary> | 3503 | /// </summary> |
3504 | public void ValidateAttachments() | 3504 | public bool ValidateAttachments() |
3505 | { | 3505 | { |
3506 | bool validated = true; | ||
3507 | |||
3506 | lock (m_attachments) | 3508 | lock (m_attachments) |
3507 | { | 3509 | { |
3508 | // Validate | 3510 | // Validate |
@@ -3512,15 +3514,21 @@ namespace OpenSim.Region.Framework.Scenes | |||
3512 | { | 3514 | { |
3513 | m_log.WarnFormat( | 3515 | m_log.WarnFormat( |
3514 | "[SCENE PRESENCE]: Failed to validate an attachment for {0} since it was null. Continuing", Name); | 3516 | "[SCENE PRESENCE]: Failed to validate an attachment for {0} since it was null. Continuing", Name); |
3517 | |||
3518 | validated = false; | ||
3515 | } | 3519 | } |
3516 | else if (gobj.IsDeleted) | 3520 | else if (gobj.IsDeleted) |
3517 | { | 3521 | { |
3518 | m_log.WarnFormat( | 3522 | m_log.WarnFormat( |
3519 | "[SCENE PRESENCE]: Failed to validate attachment {0} {1} for {2} since it had been deleted. Continuing", | 3523 | "[SCENE PRESENCE]: Failed to validate attachment {0} {1} for {2} since it had been deleted. Continuing", |
3520 | gobj.Name, gobj.UUID, Name); | 3524 | gobj.Name, gobj.UUID, Name); |
3525 | |||
3526 | validated = false; | ||
3521 | } | 3527 | } |
3522 | } | 3528 | } |
3523 | } | 3529 | } |
3530 | |||
3531 | return validated; | ||
3524 | } | 3532 | } |
3525 | 3533 | ||
3526 | /// <summary> | 3534 | /// <summary> |