diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2009-11-04 15:14:54 -0800 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2009-11-04 15:14:54 -0800 |
| commit | fa3b57bd9f0afcf2d38dae27d4b9765624baf758 (patch) | |
| tree | ff083f4e4eec5d6d4e9191f34cae6450e0a318ac /indra/newview/llfloateropenobject.cpp | |
| parent | 0e63920569302a4f6afcbc0feb28ff379e4a4bac (diff) | |
| parent | b806edf4ac47d18e1a43fb8dbb5fbcad8d13192f (diff) | |
Merge the work lost in 49c9461937df back into the tree
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; |