aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authorMelanie2013-01-27 01:09:01 +0000
committerMelanie2013-01-27 01:09:01 +0000
commitc3d68e7f9d91f202c0430faa78f59627ff796e3e (patch)
treec8f306c455994112a11462d8c2286df45a975525 /OpenSim/Region/Framework/Scenes
parentMerge branch 'master' into careminster (diff)
parentPrevent items being destroyed by rename operations. Renaming of a wearable also (diff)
downloadopensim-SC-c3d68e7f9d91f202c0430faa78f59627ff796e3e.zip
opensim-SC-c3d68e7f9d91f202c0430faa78f59627ff796e3e.tar.gz
opensim-SC-c3d68e7f9d91f202c0430faa78f59627ff796e3e.tar.bz2
opensim-SC-c3d68e7f9d91f202c0430faa78f59627ff796e3e.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs13
1 files changed, 7 insertions, 6 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index 9f0a0e2..a9e1fc2 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -401,17 +401,17 @@ namespace OpenSim.Region.Framework.Scenes
401 if (item.Owner != remoteClient.AgentId) 401 if (item.Owner != remoteClient.AgentId)
402 return; 402 return;
403 403
404 if (UUID.Zero == transactionID) 404 item.Flags = (item.Flags & ~(uint)255) | (itemUpd.Flags & (uint)255);
405 { 405 item.Name = itemUpd.Name;
406 item.Flags = (item.Flags & ~(uint)255) | (itemUpd.Flags & (uint)255); 406 item.Description = itemUpd.Description;
407 item.Name = itemUpd.Name;
408 item.Description = itemUpd.Description;
409 407
410// m_log.DebugFormat( 408// m_log.DebugFormat(
411// "[USER INVENTORY]: itemUpd {0} {1} {2} {3}, item {4} {5} {6} {7}", 409// "[USER INVENTORY]: itemUpd {0} {1} {2} {3}, item {4} {5} {6} {7}",
412// itemUpd.NextPermissions, itemUpd.GroupPermissions, itemUpd.EveryOnePermissions, item.Flags, 410// itemUpd.NextPermissions, itemUpd.GroupPermissions, itemUpd.EveryOnePermissions, item.Flags,
413// item.NextPermissions, item.GroupPermissions, item.EveryOnePermissions, item.CurrentPermissions); 411// item.NextPermissions, item.GroupPermissions, item.EveryOnePermissions, item.CurrentPermissions);
414 412
413 if (itemUpd.NextPermissions != 0) // Use this to determine validity. Can never be 0 if valid
414 {
415 if (item.NextPermissions != (itemUpd.NextPermissions & item.BasePermissions)) 415 if (item.NextPermissions != (itemUpd.NextPermissions & item.BasePermissions))
416 item.Flags |= (uint)InventoryItemFlags.ObjectOverwriteNextOwner; 416 item.Flags |= (uint)InventoryItemFlags.ObjectOverwriteNextOwner;
417 item.NextPermissions = itemUpd.NextPermissions & item.BasePermissions; 417 item.NextPermissions = itemUpd.NextPermissions & item.BasePermissions;
@@ -446,7 +446,8 @@ namespace OpenSim.Region.Framework.Scenes
446 446
447 InventoryService.UpdateItem(item); 447 InventoryService.UpdateItem(item);
448 } 448 }
449 else 449
450 if (UUID.Zero != transactionID)
450 { 451 {
451 if (AgentTransactionsModule != null) 452 if (AgentTransactionsModule != null)
452 { 453 {