diff options
| author | Don Kjer <don@lindenlab.com> | 2012-09-13 10:25:48 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2012-09-13 10:25:48 +0000 |
| commit | 8ba2b388769e245ec1b49b7d6d4b0372d684ff86 (patch) | |
| tree | b43b39372fe156aac4f70cd22456c7df8d1df101 /indra/llappearance/llwearabletype.cpp | |
| parent | 929b7e029513ecbb08c415e945c83ea09dc1b3eb (diff) | |
Fleshed out target_link_libraries dependencies between libraries. Appearance utility now reads avatar_lad.xml during stubbed out params processing.
Diffstat (limited to 'indra/llappearance/llwearabletype.cpp')
| -rw-r--r-- | indra/llappearance/llwearabletype.cpp | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/indra/llappearance/llwearabletype.cpp b/indra/llappearance/llwearabletype.cpp index aa0afe348a..618e2a1941 100644 --- a/indra/llappearance/llwearabletype.cpp +++ b/indra/llappearance/llwearabletype.cpp @@ -27,7 +27,19 @@ #include "linden_common.h" #include "llwearabletype.h" #include "llinventorytype.h" -#include "lltrans.h" + +static LLTranslationBridge* sTrans = NULL; + +// static +void LLWearableType::initClass(LLTranslationBridge* trans) +{ + sTrans = trans; +} + +void LLWearableType::cleanupClass() +{ + delete sTrans; +} struct WearableEntry : public LLDictionaryEntry { @@ -40,7 +52,7 @@ struct WearableEntry : public LLDictionaryEntry LLDictionaryEntry(name), mAssetType(assetType), mDefaultNewName(default_new_name), - mLabel(LLTrans::getString(name)), + mLabel(sTrans->getString(name)), mIconName(iconName), mDisableCameraSwitch(disable_camera_switch), mAllowMultiwear(allow_multiwear) |