diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-11-01 22:02:35 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-11-01 22:02:35 +0000 |
| commit | 7afa8058aae0d5363cc19c7df1e6d2d7ec3bf7ac (patch) | |
| tree | 52f41bda3e57a58e968421212a8a48eead6f653d /indra/newview/llinventorymodel.cpp | |
| parent | 833e8d5c2a1dd48fd89b8b438dbe56572697bb76 (diff) | |
svn merge -r 72652:72881 svn+ssh://svn.lindenlab.com/svn/linden/branches/sl-search-11 --> release
QAR-11: pair-reviewed the merge w/ Sam.
Diffstat (limited to 'indra/newview/llinventorymodel.cpp')
| -rw-r--r-- | indra/newview/llinventorymodel.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp index aa90538e40..4e54e78430 100644 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -290,12 +290,16 @@ void LLInventoryModel::getDirectDescendentsOf(const LLUUID& cat_id, // specifies 'type' as what it defaults to containing. The category is // not necessarily only for that type. *NOTE: This will create a new // inventory category on the fly if one does not exist. -LLUUID LLInventoryModel::findCategoryUUIDForType(LLAssetType::EType t) +LLUUID LLInventoryModel::findCategoryUUIDForType(LLAssetType::EType t, bool create_folder) { LLUUID rv = findCatUUID(t); - if(rv.isNull() && isInventoryUsable()) + if(rv.isNull() && isInventoryUsable() && create_folder) { - rv = createNewCategory(rv, t, NULL); + LLUUID root_id = gAgent.getInventoryRootID(); + if(root_id.notNull()) + { + rv = createNewCategory(root_id, t, NULL); + } } return rv; } |