diff options
| author | Callum Prentice <callum@lindenlab.com> | 2010-04-02 14:57:12 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2010-04-02 14:57:12 -0700 |
| commit | 98e46e28e05c22c02da41603a056c0caf34f5ad0 (patch) | |
| tree | a24352a4ce377d91428554aab15f96f887b24514 /indra/llcommon/llstring.h | |
| parent | 9e1b600d9b41afea62b2ba68fa8d5bc5861d1111 (diff) | |
| parent | 2c5c563319d5ba8eaeae93b627536321956d347e (diff) | |
Merge with tip
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) { |