diff options
author | James Cook <james@lindenlab.com> | 2009-12-07 10:40:12 -0800 |
---|---|---|
committer | James Cook <james@lindenlab.com> | 2009-12-07 10:40:12 -0800 |
commit | 864dd45b2b8dec32552112ed76246c9b0b3f7f0b (patch) | |
tree | de5ce187a9b26f67d2515fa140aa8d313e64a51d /indra/viewer_components | |
parent | 5d4959e3a107a6a40014528dd8e17e46bf128540 (diff) | |
parent | 7ff7709f9fd07de5cc9b039562d0fe3794f6ce36 (diff) |
merge
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; |