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/llinventory/tests | |
parent | 76eb05380c619daac543872d9ad3ca40a03062c0 (diff) | |
parent | 63f2ddf377fa0fc6a666cdc1001289335d86258b (diff) |
automated merge from viewer-development root
Diffstat (limited to 'indra/llinventory/tests')
-rw-r--r-- | indra/llinventory/tests/inventorymisc_test.cpp | 2 | ||||
-rw-r--r-- | indra/llinventory/tests/llparcel_test.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llinventory/tests/inventorymisc_test.cpp b/indra/llinventory/tests/inventorymisc_test.cpp index 9773a3fed4..c9af7c4eac 100644 --- a/indra/llinventory/tests/inventorymisc_test.cpp +++ b/indra/llinventory/tests/inventorymisc_test.cpp @@ -100,7 +100,7 @@ namespace tut }; typedef test_group<inventory_data> inventory_test; typedef inventory_test::object inventory_object; - tut::inventory_test inv("llinventory"); + tut::inventory_test inv("LLInventory"); //***class LLInventoryType***// diff --git a/indra/llinventory/tests/llparcel_test.cpp b/indra/llinventory/tests/llparcel_test.cpp index 80d0bdae5a..f2e4b03ff7 100644 --- a/indra/llinventory/tests/llparcel_test.cpp +++ b/indra/llinventory/tests/llparcel_test.cpp @@ -40,7 +40,7 @@ namespace tut }; typedef test_group<llinventoryparcel_data> llinventoryparcel_test; typedef llinventoryparcel_test::object llinventoryparcel_object; - tut::llinventoryparcel_test llinventoryparcel("llinventoryparcel"); + tut::llinventoryparcel_test llinventoryparcel("LLInventoryParcel"); template<> template<> void llinventoryparcel_object::test<1>() |