summaryrefslogtreecommitdiff
path: root/indra/viewer_components
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2009-12-03 10:38:26 -0500
committerNat Goodspeed <nat@lindenlab.com>2009-12-03 10:38:26 -0500
commit91dd8b2371d40d0e64898b041a71601a301ab8eb (patch)
tree1f1db933ac6531a2c95bbabfa1dca22dfbe6d1df /indra/viewer_components
parent67f11add9c2e05e1c86e30c44c94ee1b7d9205d0 (diff)
parentb626783d14db95ca167fc940230937ab2bcd054f (diff)
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/viewer_components')
-rw-r--r--indra/viewer_components/login/tests/lllogin_test.cpp2
1 files changed, 0 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..56c21016bd 100644
--- a/indra/viewer_components/login/tests/lllogin_test.cpp
+++ b/indra/viewer_components/login/tests/lllogin_test.cpp
@@ -416,7 +416,6 @@ namespace tut
ensure_equals("Failed to offline", listener.lastEvent()["state"].asString(), "offline");
}
-/*
template<> template<>
void llviewerlogin_object::test<5>()
{
@@ -452,5 +451,4 @@ namespace tut
ensure_equals("SRV Failure", listener.lastEvent()["change"].asString(), "fail.login");
}
-*/
}