aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
diff options
context:
space:
mode:
authorMelanie2013-03-18 23:48:03 +0000
committerMelanie2013-03-18 23:48:03 +0000
commit55ab6f015a6e6891aed6b882e546709ef89a1306 (patch)
tree1665fb67dfceb6dc34e9dee485d0147fccf7bd0f /OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
parentMerge branch 'master' into newmultiattach (diff)
downloadopensim-SC_OLD-55ab6f015a6e6891aed6b882e546709ef89a1306.zip
opensim-SC_OLD-55ab6f015a6e6891aed6b882e546709ef89a1306.tar.gz
opensim-SC_OLD-55ab6f015a6e6891aed6b882e546709ef89a1306.tar.bz2
opensim-SC_OLD-55ab6f015a6e6891aed6b882e546709ef89a1306.tar.xz
Fix tests for multiattach
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 2dea14d..d489821 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -289,7 +289,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
289 if (!Enabled) 289 if (!Enabled)
290 return false; 290 return false;
291 291
292 return AttachObjectInternal(sp, group, attachmentPt, silent, temp, append); 292 return AttachObjectInternal(sp, group, attachmentPt, silent, temp, true, append);
293 } 293 }
294 294
295 /// <summary> 295 /// <summary>
@@ -303,7 +303,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
303 /// <param name='temp'></param> 303 /// <param name='temp'></param>
304 /// <param name='resumeScripts'>If true then scripts are resumed on the attached object.</param> 304 /// <param name='resumeScripts'>If true then scripts are resumed on the attached object.</param>
305 private bool AttachObjectInternal( 305 private bool AttachObjectInternal(
306 IScenePresence sp, SceneObjectGroup group, uint attachmentPt, bool silent, bool temp, bool resumeScripts) 306 IScenePresence sp, SceneObjectGroup group, uint attachmentPt, bool silent, bool temp, bool resumeScripts, bool append)
307 { 307 {
308 if (group.GetSittingAvatarsCount() != 0) 308 if (group.GetSittingAvatarsCount() != 0)
309 { 309 {
@@ -889,7 +889,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
889 // This will throw if the attachment fails 889 // This will throw if the attachment fails
890 try 890 try
891 { 891 {
892 AttachObjectInternal(sp, objatt, attachmentPt, false, false, append); 892 AttachObjectInternal(sp, objatt, attachmentPt, false, false, true, append);
893 } 893 }
894 catch (Exception e) 894 catch (Exception e)
895 { 895 {