diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-05-08 07:43:08 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-05-08 07:43:08 +0000 |
| commit | a4000c3744e42fcbb638e742f3b63fa31a0dee15 (patch) | |
| tree | 7f472c30e65bbfa04ee9bc06631a1af305cc31fb /indra/newview/llwearable.cpp | |
| parent | 6c4cadbb04d633ad7b762058bdeba6e1f650dafd (diff) | |
merge trunk@116587 skinning-7@119389 -> viewer-2.0.0-skinning-7
Diffstat (limited to 'indra/newview/llwearable.cpp')
| -rw-r--r-- | indra/newview/llwearable.cpp | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/indra/newview/llwearable.cpp b/indra/newview/llwearable.cpp index f705531723..af2ed1d1ab 100644 --- a/indra/newview/llwearable.cpp +++ b/indra/newview/llwearable.cpp @@ -48,11 +48,13 @@ #include "llviewerregion.h" #include "llvoavatar.h" #include "llwearable.h" +#include "lltrans.h" using namespace LLVOAvatarDefines; // static S32 LLWearable::sCurrentDefinitionVersion = 1; +std::string LLWearable::sTypeLabel [WT_COUNT+1]; // static const std::string LLWearable::sTypeName[ WT_COUNT+1 ] = @@ -73,25 +75,13 @@ const std::string LLWearable::sTypeName[ WT_COUNT+1 ] = "invalid" }; -// static -const std::string LLWearable::sTypeLabel[ WT_COUNT+1 ] = +void LLWearable::initClass () { - "Shape", - "Skin", - "Hair", - "Eyes", - "Shirt", - "Pants", - "Shoes", - "Socks", - "Jacket", - "Gloves", - "Undershirt", - "Underpants", - "Skirt", - "invalid" -}; - + for (int i = 0; i <= WT_COUNT; i++) + { + sTypeLabel[i] = LLTrans::getString(sTypeName[i]); + } +} // static LLAssetType::EType LLWearable::typeToAssetType(EWearableType wearable_type) @@ -685,7 +675,7 @@ void LLWearable::writeToAvatar( BOOL set_by_user ) } } gFloaterCustomize->setWearable(mType, this, perm_mask, is_complete); - LLFloaterCustomize::setCurrentWearableType( mType ); + gFloaterCustomize->setCurrentWearableType( mType ); } ESex new_sex = avatar->getSex(); |