aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-09-13 22:13:58 +0100
committerJustin Clark-Casey (justincc)2011-09-13 22:13:58 +0100
commit8880aea728af2ccb95ea2400c7d180aa4dc98112 (patch)
tree76c22d083c04041b05e1dcf57be40970b8969793 /OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
parentComment out attachments code in Scene.IncomingCreateObject(UUID userID, UUID ... (diff)
downloadopensim-SC_OLD-8880aea728af2ccb95ea2400c7d180aa4dc98112.zip
opensim-SC_OLD-8880aea728af2ccb95ea2400c7d180aa4dc98112.tar.gz
opensim-SC_OLD-8880aea728af2ccb95ea2400c7d180aa4dc98112.tar.bz2
opensim-SC_OLD-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/SceneObjectPartInventory.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs5
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
index e40e57d..57adda7 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -1035,10 +1035,15 @@ namespace OpenSim.Region.Framework.Scenes
1035 item.BasePermissions = perms; 1035 item.BasePermissions = perms;
1036 } 1036 }
1037 } 1037 }
1038
1038 m_inventorySerial++; 1039 m_inventorySerial++;
1039 HasInventoryChanged = true; 1040 HasInventoryChanged = true;
1040 } 1041 }
1041 1042
1043 /// <summary>
1044 /// Returns true if this part inventory contains any scripts. False otherwise.
1045 /// </summary>
1046 /// <returns></returns>
1042 public bool ContainsScripts() 1047 public bool ContainsScripts()
1043 { 1048 {
1044 lock (m_items) 1049 lock (m_items)