diff options
| author | Melanie | 2012-09-24 20:14:00 +0100 |
|---|---|---|
| committer | Melanie | 2012-09-24 20:14:00 +0100 |
| commit | bbaf2c5a80441fdbd2f55e02ec9f46c3b66869c6 (patch) | |
| tree | 2ac67907f6333bbbc9e4d821c6607b53d0e22acb /OpenSim/Region/CoreModules/Avatar/Attachments/Tests | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | HG Rez object: warn the user if the item or asset cannot be found. (diff) | |
| download | opensim-SC-bbaf2c5a80441fdbd2f55e02ec9f46c3b66869c6.zip opensim-SC-bbaf2c5a80441fdbd2f55e02ec9f46c3b66869c6.tar.gz opensim-SC-bbaf2c5a80441fdbd2f55e02ec9f46c3b66869c6.tar.bz2 opensim-SC-bbaf2c5a80441fdbd2f55e02ec9f46c3b66869c6.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Attachments/Tests')
| -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 48f3a23..b7a1169 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs | |||
| @@ -62,7 +62,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
| 62 | public class AttachmentsModuleTests : OpenSimTestCase | 62 | public class AttachmentsModuleTests : OpenSimTestCase |
| 63 | { | 63 | { |
| 64 | private AutoResetEvent m_chatEvent = new AutoResetEvent(false); | 64 | private AutoResetEvent m_chatEvent = new AutoResetEvent(false); |
| 65 | private OSChatMessage m_osChatMessageReceived; | 65 | // private OSChatMessage m_osChatMessageReceived; |
| 66 | 66 | ||
| 67 | [TestFixtureSetUp] | 67 | [TestFixtureSetUp] |
| 68 | public void FixtureInit() | 68 | public void FixtureInit() |
| @@ -83,7 +83,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
| 83 | { | 83 | { |
| 84 | // Console.WriteLine("Got chat [{0}]", oscm.Message); | 84 | // Console.WriteLine("Got chat [{0}]", oscm.Message); |
| 85 | 85 | ||
| 86 | m_osChatMessageReceived = oscm; | 86 | // m_osChatMessageReceived = oscm; |
| 87 | m_chatEvent.Set(); | 87 | m_chatEvent.Set(); |
| 88 | } | 88 | } |
| 89 | 89 | ||