diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-09-02 15:36:16 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-09-02 15:36:16 -0400 |
commit | 51ecc8208a1b70c9742656230df00b08e082a9c8 (patch) | |
tree | edbc91488d3cf69e308b96004ed5b12efec2b579 /indra/viewer_components | |
parent | 76eb05380c619daac543872d9ad3ca40a03062c0 (diff) | |
parent | 63f2ddf377fa0fc6a666cdc1001289335d86258b (diff) |
automated merge from viewer-development root
Diffstat (limited to 'indra/viewer_components')
-rw-r--r-- | indra/viewer_components/login/tests/lllogin_test.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/viewer_components/login/tests/lllogin_test.cpp b/indra/viewer_components/login/tests/lllogin_test.cpp index 577f5dac89..95d0421273 100644 --- a/indra/viewer_components/login/tests/lllogin_test.cpp +++ b/indra/viewer_components/login/tests/lllogin_test.cpp @@ -226,7 +226,7 @@ namespace tut typedef test_group<llviewerlogin_data> llviewerlogin_group; typedef llviewerlogin_group::object llviewerlogin_object; - llviewerlogin_group llviewerlogingrp("llviewerlogin"); + llviewerlogin_group llviewerlogingrp("LLViewerLogin"); template<> template<> void llviewerlogin_object::test<1>() |