aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs12
1 files changed, 7 insertions, 5 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 8a05b96..39e3526 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -455,12 +455,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
455 sp.ClearAttachments(); 455 sp.ClearAttachments();
456 } 456 }
457 457
458 public bool AttachObject(IScenePresence sp, SceneObjectGroup group, uint attachmentPt, bool silent, bool useAttachData, bool addToInventory, bool append) 458 public bool AttachObject(IScenePresence sp, SceneObjectGroup group, uint attachmentPt, bool silent,
459 bool addToInventory, bool append)
459 { 460 {
460 if (!Enabled) 461 if (!Enabled)
461 return false; 462 return false;
462 463
463 return AttachObjectInternal(sp, group, attachmentPt, silent, useAttachData, addToInventory, false, append); 464 return AttachObjectInternal(sp, group, attachmentPt, silent, addToInventory, false, append);
464 } 465 }
465 466
466 /// <summary> 467 /// <summary>
@@ -473,7 +474,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
473 /// <param name='silent'></param> 474 /// <param name='silent'></param>
474 /// <param name='addToInventory'>If true then add object to user inventory.</param> 475 /// <param name='addToInventory'>If true then add object to user inventory.</param>
475 /// <param name='resumeScripts'>If true then scripts are resumed on the attached object.</param> 476 /// <param name='resumeScripts'>If true then scripts are resumed on the attached object.</param>
476 private bool AttachObjectInternal(IScenePresence sp, SceneObjectGroup group, uint attachmentPt, bool silent, bool useAttachData, bool addToInventory, bool resumeScripts, bool append) 477 private bool AttachObjectInternal(IScenePresence sp, SceneObjectGroup group, uint attachmentPt,
478 bool silent, bool addToInventory, bool resumeScripts, bool append)
477 { 479 {
478// m_log.DebugFormat( 480// m_log.DebugFormat(
479// "[ATTACHMENTS MODULE]: Attaching object {0} {1} to {2} point {3} from ground (silent = {4})", 481// "[ATTACHMENTS MODULE]: Attaching object {0} {1} to {2} point {3} from ground (silent = {4})",
@@ -1141,7 +1143,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
1141 objatt.ResetOwnerChangeFlag(); 1143 objatt.ResetOwnerChangeFlag();
1142 } 1144 }
1143 1145
1144 AttachObjectInternal(sp, objatt, attachmentPt, false, true, true, true, append); 1146 AttachObjectInternal(sp, objatt, attachmentPt, false, true, true, append);
1145 } 1147 }
1146 catch (Exception e) 1148 catch (Exception e)
1147 { 1149 {
@@ -1295,7 +1297,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
1295 AttachmentPt &= 0x7f; 1297 AttachmentPt &= 0x7f;
1296 1298
1297 // Calls attach with a Zero position 1299 // Calls attach with a Zero position
1298 if (AttachObject(sp, part.ParentGroup, AttachmentPt, false, false, true, append)) 1300 if (AttachObject(sp, part.ParentGroup, AttachmentPt, false, true, append))
1299 { 1301 {
1300 if (DebugLevel > 0) 1302 if (DebugLevel > 0)
1301 m_log.Debug( 1303 m_log.Debug(