summaryrefslogtreecommitdiff
path: root/indra/viewer_components
diff options
context:
space:
mode:
authorEric M. Tulla (BigPapi) <tulla@lindenlab.com>2009-11-13 19:26:20 -0500
committerEric M. Tulla (BigPapi) <tulla@lindenlab.com>2009-11-13 19:26:20 -0500
commit3194c89177e75db524c2c4e09cd40f239426a774 (patch)
tree6b042ef3c8a9e983659d128296aeeedefa62fefd /indra/viewer_components
parent4bb5cd169b297efbcf1bdb58a45be24932cf8241 (diff)
parentc5732c824fcde73953cfdf971ba35a88abd54d0c (diff)
Merging viewer2 changes into avp branch
--HG-- branch : avatar-pipeline
Diffstat (limited to 'indra/viewer_components')
-rw-r--r--indra/viewer_components/login/tests/lllogin_test.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/viewer_components/login/tests/lllogin_test.cpp b/indra/viewer_components/login/tests/lllogin_test.cpp
index 56c21016bd..99ea796ad0 100644
--- a/indra/viewer_components/login/tests/lllogin_test.cpp
+++ b/indra/viewer_components/login/tests/lllogin_test.cpp
@@ -416,6 +416,7 @@ namespace tut
ensure_equals("Failed to offline", listener.lastEvent()["state"].asString(), "offline");
}
+/*
template<> template<>
void llviewerlogin_object::test<5>()
{
@@ -451,4 +452,5 @@ namespace tut
ensure_equals("SRV Failure", listener.lastEvent()["change"].asString(), "fail.login");
}
+*/
}