diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-04 16:14:49 +0200 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-04 16:14:49 +0200 |
commit | 5fac7f1d35336890d99333500da26c56643e5dc7 (patch) | |
tree | 4c20d799552195d0827ad76a978cfaafc0c3025d /indra/viewer_components | |
parent | 63cebc3ae05c952d538d17e392ebeb98c2e86cfb (diff) | |
parent | 25b6b5929e4a74023150d729c85b54ae2726c21d (diff) |
Merge from default branch.
--HG--
branch : product-engine
Diffstat (limited to 'indra/viewer_components')
-rw-r--r-- | indra/viewer_components/login/tests/lllogin_test.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/viewer_components/login/tests/lllogin_test.cpp b/indra/viewer_components/login/tests/lllogin_test.cpp index 99ea796ad0..6255f7ed15 100644 --- a/indra/viewer_components/login/tests/lllogin_test.cpp +++ b/indra/viewer_components/login/tests/lllogin_test.cpp @@ -231,6 +231,7 @@ namespace tut ensure_equals("Online state", listener.lastEvent()["state"].asString(), "online"); } + /* template<> template<> void llviewerlogin_object::test<2>() { @@ -416,8 +417,8 @@ namespace tut ensure_equals("Failed to offline", listener.lastEvent()["state"].asString(), "offline"); } -/* - template<> template<> + *FIX:Mani Disabled unit boost::coro is patched + template<> template<> void llviewerlogin_object::test<5>() { DEBUG; |