diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-11-04 16:13:07 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-04 16:13:07 -0800 |
| commit | e1c5abce9309a89bd9993264bca8dadadf882c6f (patch) | |
| tree | 81e1f91811b207abd4dfe4c82db31583d92df212 /indra/llinventory/tests/inventorymisc_test.cpp | |
| parent | 33eac5dc0a1dfc0624dcfc75bec35155fbb9c917 (diff) | |
| parent | 0bd2567bf5648808a95c7826581199bb371597cb (diff) | |
merge with remote repo
Diffstat (limited to 'indra/llinventory/tests/inventorymisc_test.cpp')
| -rw-r--r-- | indra/llinventory/tests/inventorymisc_test.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llinventory/tests/inventorymisc_test.cpp b/indra/llinventory/tests/inventorymisc_test.cpp index 770594dc9d..c797a70c50 100644 --- a/indra/llinventory/tests/inventorymisc_test.cpp +++ b/indra/llinventory/tests/inventorymisc_test.cpp @@ -94,7 +94,7 @@ LLPointer<LLInventoryCategory> create_random_inventory_cat() LLPointer<LLInventoryCategory> cat = new LLInventoryCategory( item_id, parent_id, - LLAssetType::AT_NONE, + LLFolderType::FT_NONE, std::string("Sample category")); return cat; } @@ -452,7 +452,7 @@ namespace tut ensure_equals("4.type::getType() failed", dst->getType(), src->getType()); ensure_equals("5.preferred type::getPreferredType() failed", dst->getPreferredType(), src->getPreferredType()); - src->setPreferredType( LLAssetType::AT_TEXTURE); + src->setPreferredType( LLFolderType::FT_TEXTURE); sd = ll_create_sd_from_inventory_category(src); dst = ll_create_category_from_sd(sd); ensure_equals("6.preferred type::getPreferredType() failed", dst->getPreferredType(), src->getPreferredType()); |