summaryrefslogtreecommitdiff
path: root/indra/viewer_components
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2009-12-04 19:01:31 -0500
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2009-12-04 19:01:31 -0500
commit16efeb85817cce82e594cf8482f5e52385a59ad1 (patch)
tree85878d4b882faa0157d1be26dc6e0e28d582c218 /indra/viewer_components
parentf017058345ba1bc2682051017d3f9c0d6ea3db72 (diff)
parent938c51d2a483962556ee183c24e2b3f635f2c56b (diff)
merge
--HG-- branch : avatar-pipeline
Diffstat (limited to 'indra/viewer_components')
-rw-r--r--indra/viewer_components/login/tests/lllogin_test.cpp5
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;