aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
diff options
context:
space:
mode:
authorTom2011-09-14 19:11:32 -0700
committerTom2011-09-14 19:11:32 -0700
commit5484c9b585a2a6289456e9492ac2989d489b555c (patch)
treec9b79199722fe09c993c237dce40febf731264e3 /OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
parentMerge fixes, and fix the build (diff)
parentDon't try and delete attachments for child agent close (diff)
downloadopensim-SC_OLD-5484c9b585a2a6289456e9492ac2989d489b555c.zip
opensim-SC_OLD-5484c9b585a2a6289456e9492ac2989d489b555c.tar.gz
opensim-SC_OLD-5484c9b585a2a6289456e9492ac2989d489b555c.tar.bz2
opensim-SC_OLD-5484c9b585a2a6289456e9492ac2989d489b555c.tar.xz
Bring us up to date.
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 1f0840d..f6b690c 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
@@ -1239,10 +1239,15 @@ namespace OpenSim.Region.Framework.Scenes
1239 item.CurrentPermissions = perms; 1239 item.CurrentPermissions = perms;
1240 item.BasePermissions = perms; 1240 item.BasePermissions = perms;
1241 } 1241 }
1242
1242 m_inventorySerial++; 1243 m_inventorySerial++;
1243 HasInventoryChanged = true; 1244 HasInventoryChanged = true;
1244 } 1245 }
1245 1246
1247 /// <summary>
1248 /// Returns true if this part inventory contains any scripts. False otherwise.
1249 /// </summary>
1250 /// <returns></returns>
1246 public bool ContainsScripts() 1251 public bool ContainsScripts()
1247 { 1252 {
1248 foreach (TaskInventoryItem item in m_items.Values) 1253 foreach (TaskInventoryItem item in m_items.Values)