diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-04-01 15:33:05 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-04-01 15:33:05 -0700 |
| commit | db0ffdf270f9f9b656333e317a0cf6fadc14a711 (patch) | |
| tree | 6008b6b3c36dd9cd6bd7e51d63aea7210396e7bf /indra/llcommon/llstring.h | |
| parent | 959ec0c305914ac71caa12920ca81230d5d9a6c4 (diff) | |
| parent | 406b595e8c6811c2550340ba316328289d8b856f (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) { |