diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-12-04 13:50:32 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-12-04 13:50:32 -0500 |
| commit | c9c9943098d35914f7b8591bf66ea1ae3985a94e (patch) | |
| tree | daa74a4288a0e5e5c028717e0b925633c11eac5b /indra/viewer_components | |
| parent | 92a1ecd5fdfff2490cb563e83baff88fc6120882 (diff) | |
| parent | 5b695ac56a7fbbb4d1f63bccb0c147c46e56ebcf (diff) | |
automated merge viewer2.0->avp
--HG--
branch : avatar-pipeline
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; |