diff options
author | Justin Clark-Casey (justincc) | 2011-09-13 22:13:58 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-09-13 22:13:58 +0100 |
commit | 8880aea728af2ccb95ea2400c7d180aa4dc98112 (patch) | |
tree | 76c22d083c04041b05e1dcf57be40970b8969793 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs | |
parent | Comment out attachments code in Scene.IncomingCreateObject(UUID userID, UUID ... (diff) | |
download | opensim-SC-8880aea728af2ccb95ea2400c7d180aa4dc98112.zip opensim-SC-8880aea728af2ccb95ea2400c7d180aa4dc98112.tar.gz opensim-SC-8880aea728af2ccb95ea2400c7d180aa4dc98112.tar.bz2 opensim-SC-8880aea728af2ccb95ea2400c7d180aa4dc98112.tar.xz |
Stop attempts to rewear already worn items from removing and reattaching.
Viewer 2/3 will sometimes attempt to rewear attachments, even though they have already been attached during the main login process.
This change ignores those attempts.
This stops script failures during login, as the rewearing was racing with the script startup code.
It might also help with attachments being abnormally put into deleted state.
Hopefully resolves some more of http://opensimulator.org/mantis/view.php?id=5644
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs index 4bca3d0..905ecc9 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs | |||
@@ -389,5 +389,18 @@ namespace OpenSim.Region.Framework.Scenes | |||
389 | for (int i = 0; i < parts.Length; i++) | 389 | for (int i = 0; i < parts.Length; i++) |
390 | parts[i].Inventory.ResumeScripts(); | 390 | parts[i].Inventory.ResumeScripts(); |
391 | } | 391 | } |
392 | |||
393 | /// <summary> | ||
394 | /// Returns true if any part in the scene object contains scripts, false otherwise. | ||
395 | /// </summary> | ||
396 | /// <returns></returns> | ||
397 | public bool ContainsScripts() | ||
398 | { | ||
399 | foreach (SceneObjectPart part in Parts) | ||
400 | if (part.Inventory.ContainsScripts()) | ||
401 | return true; | ||
402 | |||
403 | return false; | ||
404 | } | ||
392 | } | 405 | } |
393 | } | 406 | } |