diff options
| author | Loren Shih <seraph@lindenlab.com> | 2009-08-12 19:03:20 +0000 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2009-08-12 19:03:20 +0000 |
| commit | 7bbc5cdea6beb4e05c26d1472f789fe6fa536ee3 (patch) | |
| tree | 9e496156bb377c9bdf0b793a1b07b72dfa4f032c /indra/llcommon | |
| parent | 0bf4b5f2222ffb8171be094613363427f3b8470a (diff) | |
svn merge -r129617:130277 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/currently-worn-folder-5 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3
For DEV-34223 : AVP Current Outfit Folder
For DEV-37485 : AVP Appearance Side Panel
For DEV-35335 : AVP Automatic Folder Classification
This merges the Appearance Side Panel / Ensemble Typing / Current Outfit Folder work for the AVP team.
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/llassettype.cpp | 6 | ||||
| -rw-r--r-- | indra/llcommon/llassettype.h | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/indra/llcommon/llassettype.cpp b/indra/llcommon/llassettype.cpp index d431071c25..835cdbca04 100644 --- a/indra/llcommon/llassettype.cpp +++ b/indra/llcommon/llassettype.cpp @@ -282,6 +282,12 @@ bool LLAssetType::lookupIsProtectedCategoryType(EType asset_type) return true; } +// static +bool LLAssetType::lookupIsEnsembleCategoryType(EType asset_type) +{ + return (asset_type >= AT_FOLDER_ENSEMBLE_START && + asset_type <= AT_FOLDER_ENSEMBLE_END); +} // static. Generate a good default description void LLAssetType::generateDescriptionFor(LLAssetType::EType asset_type, diff --git a/indra/llcommon/llassettype.h b/indra/llcommon/llassettype.h index 8ab7510494..5e51188541 100644 --- a/indra/llcommon/llassettype.h +++ b/indra/llcommon/llassettype.h @@ -186,6 +186,7 @@ public: static const char* lookupCategoryName(EType asset_type); static bool lookupIsProtectedCategoryType(EType asset_type); + static bool lookupIsEnsembleCategoryType(EType asset_type); /* TODO: Change return types from "const char *" to "const std::string &". This is fairly straightforward, but requires changing some calls to use .c_str(). |