diff options
author | angela <angela@lindenlab.com> | 2009-11-05 11:41:07 +0800 |
---|---|---|
committer | angela <angela@lindenlab.com> | 2009-11-05 11:41:07 +0800 |
commit | 95738da3d82b92e82744dbc6b377a3feae2e6441 (patch) | |
tree | cf1678c617ea644a14d20a40fbfc58f156fd9591 /indra/newview/llfloateropenobject.cpp | |
parent | 35c7c7a9b29ef4462ea969b393c25b59813ef169 (diff) | |
parent | af401ac6dc463db477210b0ff100014fbeb50a9a (diff) |
merge
Diffstat (limited to 'indra/newview/llfloateropenobject.cpp')
-rw-r--r-- | indra/newview/llfloateropenobject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloateropenobject.cpp b/indra/newview/llfloateropenobject.cpp index b6ec0868cf..e277aba493 100644 --- a/indra/newview/llfloateropenobject.cpp +++ b/indra/newview/llfloateropenobject.cpp @@ -158,14 +158,14 @@ void LLFloaterOpenObject::moveToInventory(bool wear) if (wear) { parent_category_id = gInventory.findCategoryUUIDForType( - LLAssetType::AT_CLOTHING); + LLFolderType::FT_CLOTHING); } else { parent_category_id = gInventory.getRootFolderID(); } LLUUID category_id = gInventory.createNewCategory(parent_category_id, - LLAssetType::AT_NONE, + LLFolderType::FT_NONE, name); LLCatAndWear* data = new LLCatAndWear; |