diff options
author | skolb <none@none> | 2009-12-03 09:18:11 -0800 |
---|---|---|
committer | skolb <none@none> | 2009-12-03 09:18:11 -0800 |
commit | 7851819c88e8049c1c3d07d279d479c53d5de777 (patch) | |
tree | e8c81e110a71427b64e0b34f4351e7acf44465f3 /indra/viewer_components | |
parent | 9b17e6710b713fa12f6db7d6f51d97e4052a0835 (diff) | |
parent | 57b68d9bfe25fc7b9efe41a9fa30935c156acb34 (diff) |
local merge
Diffstat (limited to 'indra/viewer_components')
-rw-r--r-- | indra/viewer_components/login/tests/lllogin_test.cpp | 2 |
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"); } -*/ } |