summaryrefslogtreecommitdiff
path: root/indra/viewer_components
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2009-11-30 11:30:10 -0800
committerNat Goodspeed <nat@lindenlab.com>2009-11-30 11:30:10 -0800
commitc5b5e56f7444ab13e89dac1cddfed5710164c066 (patch)
tree283e057c8ce956f0e1568de7ab66f1cf061deaa9 /indra/viewer_components
parent6223485bfafb9343f4e352014dec7f53717bcb47 (diff)
parent7b6ddb4106726f1d4f39a98cc5d7b49e39abc907 (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");
}
-*/
}