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/llprimitive | |
| parent | 76eb05380c619daac543872d9ad3ca40a03062c0 (diff) | |
| parent | 63f2ddf377fa0fc6a666cdc1001289335d86258b (diff) | |
automated merge from viewer-development root
Diffstat (limited to 'indra/llprimitive')
| -rw-r--r-- | indra/llprimitive/tests/llmediaentry_test.cpp | 2 | ||||
| -rw-r--r-- | indra/llprimitive/tests/llprimitive_test.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llprimitive/tests/llmediaentry_test.cpp b/indra/llprimitive/tests/llmediaentry_test.cpp index 5234ea25f9..16e5f894e2 100644 --- a/indra/llprimitive/tests/llmediaentry_test.cpp +++ b/indra/llprimitive/tests/llmediaentry_test.cpp @@ -169,7 +169,7 @@ namespace tut namespace { // this is for naming our tests to make pretty output - tut::factory tf("MediaEntry Test"); + tut::factory tf("LLMediaEntry"); } namespace tut diff --git a/indra/llprimitive/tests/llprimitive_test.cpp b/indra/llprimitive/tests/llprimitive_test.cpp index e181a59dd6..0d60c7cd15 100644 --- a/indra/llprimitive/tests/llprimitive_test.cpp +++ b/indra/llprimitive/tests/llprimitive_test.cpp @@ -96,7 +96,7 @@ namespace tut typedef test_group<llprimitive> llprimitive_t; typedef llprimitive_t::object llprimitive_object_t; - tut::llprimitive_t tut_llprimitive("llprimitive"); + tut::llprimitive_t tut_llprimitive("LLPrimitive"); template<> template<> void llprimitive_object_t::test<1>() |