diff options
| author | UbitUmarov | 2015-11-24 14:28:35 +0000 |
|---|---|---|
| committer | UbitUmarov | 2015-11-24 14:28:35 +0000 |
| commit | 08d061d2018acfd44f904c82f734156d10914fe1 (patch) | |
| tree | 3d6228089706bca0cec862eab198e94b5d6e67cf /OpenSim | |
| parent | at end of teleport disable the sending simulator, not destiny (diff) | |
| download | opensim-SC_OLD-08d061d2018acfd44f904c82f734156d10914fe1.zip opensim-SC_OLD-08d061d2018acfd44f904c82f734156d10914fe1.tar.gz opensim-SC_OLD-08d061d2018acfd44f904c82f734156d10914fe1.tar.bz2 opensim-SC_OLD-08d061d2018acfd44f904c82f734156d10914fe1.tar.xz | |
reset control even prior to use
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs index 3971da0..2ef86c9 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs | |||
| @@ -556,6 +556,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
| 556 | // In the future, we need to be able to do this programatically more predicably. | 556 | // In the future, we need to be able to do this programatically more predicably. |
| 557 | scene.EventManager.OnChatFromWorld += OnChatFromWorld; | 557 | scene.EventManager.OnChatFromWorld += OnChatFromWorld; |
| 558 | 558 | ||
| 559 | m_chatEvent.Reset(); | ||
| 559 | scene.AttachmentsModule.RezSingleAttachmentFromInventory(sp, userItem.ID, (uint)AttachmentPoint.Chest); | 560 | scene.AttachmentsModule.RezSingleAttachmentFromInventory(sp, userItem.ID, (uint)AttachmentPoint.Chest); |
| 560 | 561 | ||
| 561 | m_chatEvent.WaitOne(60000); | 562 | m_chatEvent.WaitOne(60000); |
| @@ -669,6 +670,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
| 669 | // In the future, we need to be able to do this programatically more predicably. | 670 | // In the future, we need to be able to do this programatically more predicably. |
| 670 | scene.EventManager.OnChatFromWorld += OnChatFromWorld; | 671 | scene.EventManager.OnChatFromWorld += OnChatFromWorld; |
| 671 | 672 | ||
| 673 | m_chatEvent.Reset(); | ||
| 672 | SceneObjectGroup rezzedSo | 674 | SceneObjectGroup rezzedSo |
| 673 | = (SceneObjectGroup)(scene.AttachmentsModule.RezSingleAttachmentFromInventory(sp, userItem.ID, (uint)AttachmentPoint.Chest)); | 675 | = (SceneObjectGroup)(scene.AttachmentsModule.RezSingleAttachmentFromInventory(sp, userItem.ID, (uint)AttachmentPoint.Chest)); |
| 674 | 676 | ||