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