diff options
| author | Melanie | 2012-06-06 14:16:19 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-06 14:16:19 +0100 |
| commit | c0b21d92c2219c3bfd69e1467c28f20859dd4dc7 (patch) | |
| tree | edb346e1bcde87b1029babc753df9279e4102239 /OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | fix the real cause of double velocity (diff) | |
| download | opensim-SC_OLD-c0b21d92c2219c3bfd69e1467c28f20859dd4dc7.zip opensim-SC_OLD-c0b21d92c2219c3bfd69e1467c28f20859dd4dc7.tar.gz opensim-SC_OLD-c0b21d92c2219c3bfd69e1467c28f20859dd4dc7.tar.bz2 opensim-SC_OLD-c0b21d92c2219c3bfd69e1467c28f20859dd4dc7.tar.xz | |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs index 5e89eec..acf0089 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs | |||
| @@ -106,7 +106,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
| 106 | 106 | ||
| 107 | SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, attName, m_presence.UUID).ParentGroup; | 107 | SceneObjectGroup so = SceneHelpers.AddSceneObject(scene, attName, m_presence.UUID).ParentGroup; |
| 108 | 108 | ||
| 109 | m_attMod.AttachObject(m_presence, so, (uint)AttachmentPoint.Chest, false); | 109 | m_attMod.AttachObject(m_presence, so, (uint)AttachmentPoint.Chest, false, false); |
| 110 | 110 | ||
| 111 | // Check status on scene presence | 111 | // Check status on scene presence |
| 112 | Assert.That(m_presence.HasAttachments(), Is.True); | 112 | Assert.That(m_presence.HasAttachments(), Is.True); |
| @@ -326,4 +326,4 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
| 326 | // Assert.That(presence.HasAttachments(), Is.True, "Presence has not received new objects"); | 326 | // Assert.That(presence.HasAttachments(), Is.True, "Presence has not received new objects"); |
| 327 | // } | 327 | // } |
| 328 | } | 328 | } |
| 329 | } \ No newline at end of file | 329 | } |