diff options
author | Matthew Breindel (Falcon) <falcon@lindenlab.com> | 2010-04-01 17:03:59 -0700 |
---|---|---|
committer | Matthew Breindel (Falcon) <falcon@lindenlab.com> | 2010-04-01 17:03:59 -0700 |
commit | b1ae22c3eb71767219ebb96ec80011e10bbfabbe (patch) | |
tree | 41eb0fd5eb7f4986f99ce2a0d11273c32f33e7d1 /indra/llcommon/llstring.h | |
parent | f17cfd952a274cc6c684e50db004d62373a49d1f (diff) | |
parent | 9bdbc10aba78d7c6fec832ee4c411b483f05c441 (diff) |
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) { |