aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2012-08-14 01:12:27 +0100
committerMelanie2012-08-14 01:12:27 +0100
commit9bd2c1b88add5d6cc529a6882a7067200cb78ecb (patch)
tree5004acb4eb41d446f65b0ae0dd55900320ed68fa /OpenSim
parentAdd the skeleton for the temp attachments module (diff)
downloadopensim-SC_OLD-9bd2c1b88add5d6cc529a6882a7067200cb78ecb.zip
opensim-SC_OLD-9bd2c1b88add5d6cc529a6882a7067200cb78ecb.tar.gz
opensim-SC_OLD-9bd2c1b88add5d6cc529a6882a7067200cb78ecb.tar.bz2
opensim-SC_OLD-9bd2c1b88add5d6cc529a6882a7067200cb78ecb.tar.xz
As per lindn spec, disable detach and drop for temp attachments
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs8
1 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 77dd0f0..f107be1 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -410,6 +410,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
410 410
411 UUID inventoryID = so.FromItemID; 411 UUID inventoryID = so.FromItemID;
412 412
413 // As per Linden spec, drop is disabled for temp attachs
414 if (inventoryID == UUID.Zero)
415 return;
416
413// m_log.DebugFormat( 417// m_log.DebugFormat(
414// "[ATTACHMENTS MODULE]: In DetachSingleAttachmentToGround(), object is {0} {1}, associated item is {2}", 418// "[ATTACHMENTS MODULE]: In DetachSingleAttachmentToGround(), object is {0} {1}, associated item is {2}",
415// so.Name, so.LocalId, inventoryID); 419// so.Name, so.LocalId, inventoryID);
@@ -454,6 +458,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
454 458
455 public void DetachSingleAttachmentToInv(IScenePresence sp, SceneObjectGroup so) 459 public void DetachSingleAttachmentToInv(IScenePresence sp, SceneObjectGroup so)
456 { 460 {
461 // As per Linden spec, detach (take) is disabled for temp attachs
462 if (so.FromItemID == UUID.Zero)
463 return;
464
457 lock (sp.AttachmentsSyncLock) 465 lock (sp.AttachmentsSyncLock)
458 { 466 {
459 // Save avatar attachment information 467 // Save avatar attachment information