diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-06-10 00:45:48 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-06-10 00:45:48 -0500 |
| commit | f9b13d8f8510b1f7f02fcf92685471461b79858e (patch) | |
| tree | 72e3469605fb33aedc211649778c22ada2719d5c /indra/newview/llviewertexteditor.cpp | |
| parent | c2da9f5d2cc86af0af34199c53e872fbff22637b (diff) | |
Add "LL_MESH_ENABLED" preprocessor flag for toggling mesh code. Couple of merge fixes.
Diffstat (limited to 'indra/newview/llviewertexteditor.cpp')
| -rw-r--r-- | indra/newview/llviewertexteditor.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llviewertexteditor.cpp b/indra/newview/llviewertexteditor.cpp index d35be8e1bf..697e8afa65 100644 --- a/indra/newview/llviewertexteditor.cpp +++ b/indra/newview/llviewertexteditor.cpp @@ -535,7 +535,9 @@ LLUIImagePtr LLEmbeddedItems::getItemImage(llwchar ext_char) const case LLAssetType::AT_BODYPART: img_name = "Inv_Skin"; break; case LLAssetType::AT_ANIMATION: img_name = "Inv_Animation"; break; case LLAssetType::AT_GESTURE: img_name = "Inv_Gesture"; break; +#if LL_MESH_ENABLED case LLAssetType::AT_MESH: img_name = "Inv_Mesh"; break; +#endif default: llassert(0); } |