summaryrefslogtreecommitdiff
path: root/indra/llcommon/llassettype.cpp
diff options
context:
space:
mode:
authorBryan O'Sullivan <bos@lindenlab.com>2009-11-03 13:39:02 -0800
committerBryan O'Sullivan <bos@lindenlab.com>2009-11-03 13:39:02 -0800
commit28ed8f84d86403cf90b7963b147d2ac5c6cf37c7 (patch)
treecebb2895642b96aa64e8cf8c2eb402e8423165d6 /indra/llcommon/llassettype.cpp
parent9c3595465972ba4be916e871f6b0a62cc0c13d4a (diff)
parent63b9bd43ff41da01d549f630bd838caff0dffd97 (diff)
Merge with SVN render-pipeline-8 branch
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 d57494b444..f3aff332ba 100644
--- a/indra/llcommon/llassettype.cpp
+++ b/indra/llcommon/llassettype.cpp
@@ -290,6 +290,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)