diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-01 17:12:12 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-01 17:12:12 +0100 |
| commit | 569f322f0d43ba4e1f079d362d333af5b84a0e32 (patch) | |
| tree | 7141309c52129400982944d1f91667b74d65c6cb /indra/llcommon/llstring.h | |
| parent | 8421d3dcd3aad07efecbfa490ccc8e71119b9cab (diff) | |
| parent | b98ebdecda66a1f08e74321cb255e39edfbc47dd (diff) | |
PE merge
Diffstat (limited to 'indra/llcommon/llstring.h')
| -rw-r--r-- | indra/llcommon/llstring.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h index 62cedcde4e..96588b29b9 100644 --- a/indra/llcommon/llstring.h +++ b/indra/llcommon/llstring.h @@ -241,8 +241,8 @@ public: LL_COMMON_API static S32 format(std::basic_string<T>& s, const LLSD& substitutions); LL_COMMON_API static bool simpleReplacement(std::basic_string<T>& replacement, std::basic_string<T> token, const format_map_t& substitutions); LL_COMMON_API static bool simpleReplacement(std::basic_string<T>& replacement, std::basic_string<T> token, const LLSD& substitutions); - static void setLocale (std::string inLocale) {sLocale = inLocale;}; - static std::string getLocale (void) {return sLocale;}; + LL_COMMON_API static void setLocale (std::string inLocale); + LL_COMMON_API static std::string getLocale (void); static bool isValidIndex(const std::basic_string<T>& string, size_type i) { |