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/llimage | |
| parent | 76eb05380c619daac543872d9ad3ca40a03062c0 (diff) | |
| parent | 63f2ddf377fa0fc6a666cdc1001289335d86258b (diff) | |
automated merge from viewer-development root
Diffstat (limited to 'indra/llimage')
| -rw-r--r-- | indra/llimage/tests/llimageworker_test.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llimage/tests/llimageworker_test.cpp b/indra/llimage/tests/llimageworker_test.cpp index 98694aa7ee..a109276709 100644 --- a/indra/llimage/tests/llimageworker_test.cpp +++ b/indra/llimage/tests/llimageworker_test.cpp @@ -144,11 +144,11 @@ namespace tut // Tut templating thingamagic: test group, object and test instance typedef test_group<imagedecodethread_test> imagedecodethread_t; typedef imagedecodethread_t::object imagedecodethread_object_t; - tut::imagedecodethread_t tut_imagedecodethread("imagedecodethread"); + tut::imagedecodethread_t tut_imagedecodethread("LLImageDecodeThread"); typedef test_group<imagerequest_test> imagerequest_t; typedef imagerequest_t::object imagerequest_object_t; - tut::imagerequest_t tut_imagerequest("imagerequest"); + tut::imagerequest_t tut_imagerequest("LLImageRequest"); // --------------------------------------------------------------------------------------- // Test functions |