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/newview/tests/llworldmap_test.cpp | |
| parent | 76eb05380c619daac543872d9ad3ca40a03062c0 (diff) | |
| parent | 63f2ddf377fa0fc6a666cdc1001289335d86258b (diff) | |
automated merge from viewer-development root
Diffstat (limited to 'indra/newview/tests/llworldmap_test.cpp')
| -rw-r--r-- | indra/newview/tests/llworldmap_test.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/tests/llworldmap_test.cpp b/indra/newview/tests/llworldmap_test.cpp index 443279c062..b976ac5ea9 100644 --- a/indra/newview/tests/llworldmap_test.cpp +++ b/indra/newview/tests/llworldmap_test.cpp @@ -144,15 +144,15 @@ namespace tut // Tut templating thingamagic: test group, object and test instance typedef test_group<iteminfo_test> iteminfo_t; typedef iteminfo_t::object iteminfo_object_t; - tut::iteminfo_t tut_iteminfo("iteminfo"); + tut::iteminfo_t tut_iteminfo("LLItemInfo"); typedef test_group<siminfo_test> siminfo_t; typedef siminfo_t::object siminfo_object_t; - tut::siminfo_t tut_siminfo("siminfo"); + tut::siminfo_t tut_siminfo("LLSimInfo"); typedef test_group<worldmap_test> worldmap_t; typedef worldmap_t::object worldmap_object_t; - tut::worldmap_t tut_worldmap("worldmap"); + tut::worldmap_t tut_worldmap("LLWorldMap"); // --------------------------------------------------------------------------------------- // Test functions |