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.h | |
| 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.h')
| -rw-r--r-- | indra/newview/llinventorymodel.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llinventorymodel.h b/indra/newview/llinventorymodel.h index e321f1fcc8..b560aea8b2 100644 --- a/indra/newview/llinventorymodel.h +++ b/indra/newview/llinventorymodel.h @@ -237,7 +237,10 @@ public: // 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 findCategoryUUIDForType(LLAssetType::EType preferred_type); + + // SDK: Added flag to specify whether the folder should be created if not found. This fixes the horrible + // multiple trash can bug. + LLUUID findCategoryUUIDForType(LLAssetType::EType preferred_type, bool create_folder = true); // Call this method when it's time to update everyone on a new // state, by default, the inventory model will not update |