diff options
author | Melanie | 2013-03-18 23:48:03 +0000 |
---|---|---|
committer | Melanie | 2013-03-18 23:48:03 +0000 |
commit | 55ab6f015a6e6891aed6b882e546709ef89a1306 (patch) | |
tree | 1665fb67dfceb6dc34e9dee485d0147fccf7bd0f /OpenSim/Region/CoreModules/Avatar/Attachments | |
parent | Merge branch 'master' into newmultiattach (diff) | |
download | opensim-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')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs | 6 |
2 files changed, 6 insertions, 6 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 | { |
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs index 0c1df6a..4cd03da 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs | |||
@@ -244,7 +244,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
244 | SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, "att1", sp.UUID); | 244 | SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, "att1", sp.UUID); |
245 | 245 | ||
246 | m_numberOfAttachEventsFired = 0; | 246 | m_numberOfAttachEventsFired = 0; |
247 | scene.AttachmentsModule.AttachObject(sp, so, (uint)AttachmentPoint.Default, false, false); | 247 | scene.AttachmentsModule.AttachObject(sp, so, (uint)AttachmentPoint.Default, false, false, false); |
248 | 248 | ||
249 | // Check status on scene presence | 249 | // Check status on scene presence |
250 | Assert.That(sp.HasAttachments(), Is.True); | 250 | Assert.That(sp.HasAttachments(), Is.True); |
@@ -277,7 +277,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
277 | 277 | ||
278 | // Test wearing a different attachment from the ground. | 278 | // Test wearing a different attachment from the ground. |
279 | { | 279 | { |
280 | scene.AttachmentsModule.AttachObject(sp, so2, (uint)AttachmentPoint.Default, false, false); | 280 | scene.AttachmentsModule.AttachObject(sp, so2, (uint)AttachmentPoint.Default, false, false, false); |
281 | 281 | ||
282 | // Check status on scene presence | 282 | // Check status on scene presence |
283 | Assert.That(sp.HasAttachments(), Is.True); | 283 | Assert.That(sp.HasAttachments(), Is.True); |
@@ -310,7 +310,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
310 | 310 | ||
311 | // Test rewearing an already worn attachment from ground. Nothing should happen. | 311 | // Test rewearing an already worn attachment from ground. Nothing should happen. |
312 | { | 312 | { |
313 | scene.AttachmentsModule.AttachObject(sp, so2, (uint)AttachmentPoint.Default, false, false); | 313 | scene.AttachmentsModule.AttachObject(sp, so2, (uint)AttachmentPoint.Default, false, false, false); |
314 | 314 | ||
315 | // Check status on scene presence | 315 | // Check status on scene presence |
316 | Assert.That(sp.HasAttachments(), Is.True); | 316 | Assert.That(sp.HasAttachments(), Is.True); |