summaryrefslogtreecommitdiff
path: root/indra/llcommon/llassettype.cpp
diff options
context:
space:
mode:
authorBryan O'Sullivan <bos@lindenlab.com>2009-09-29 16:20:20 -0700
committerBryan O'Sullivan <bos@lindenlab.com>2009-09-29 16:20:20 -0700
commit9b8b0571645f8b607ecc24221c807cc02a03692f (patch)
treef52f58138ecf70abf21f2a1b62097c3cbfce1c2f /indra/llcommon/llassettype.cpp
parent6d887be5895286f6b65ea751014f33bd9e0faac4 (diff)
parent5798ac6fc8488f02d3a2f338f5b5eeedb35e7ba6 (diff)
Merge
Diffstat (limited to 'indra/llcommon/llassettype.cpp')
-rw-r--r--indra/llcommon/llassettype.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llcommon/llassettype.cpp b/indra/llcommon/llassettype.cpp
index 5d7672b378..78aa6f4f37 100644
--- a/indra/llcommon/llassettype.cpp
+++ b/indra/llcommon/llassettype.cpp
@@ -289,6 +289,7 @@ bool LLAssetType::lookupIsEnsembleCategoryType(EType asset_type)
asset_type <= AT_FOLDER_ENSEMBLE_END);
}
+
// static. Generate a good default description
void LLAssetType::generateDescriptionFor(LLAssetType::EType asset_type,
std::string& description)