diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-11-01 22:02:35 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-11-01 22:02:35 +0000 |
| commit | 7afa8058aae0d5363cc19c7df1e6d2d7ec3bf7ac (patch) | |
| tree | 52f41bda3e57a58e968421212a8a48eead6f653d /indra/llui/llresmgr.h | |
| parent | 833e8d5c2a1dd48fd89b8b438dbe56572697bb76 (diff) | |
svn merge -r 72652:72881 svn+ssh://svn.lindenlab.com/svn/linden/branches/sl-search-11 --> release
QAR-11: pair-reviewed the merge w/ Sam.
Diffstat (limited to 'indra/llui/llresmgr.h')
| -rw-r--r-- | indra/llui/llresmgr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llresmgr.h b/indra/llui/llresmgr.h index d9e58bc066..be2a35513f 100644 --- a/indra/llui/llresmgr.h +++ b/indra/llui/llresmgr.h @@ -132,7 +132,7 @@ public: char getMonetaryDecimalPoint() const; char getMonetaryThousandsSeparator() const; - void getMonetaryString( LLString& output, S32 input ) const; + std::string getMonetaryString( S32 input ) const; void getIntegerString( LLString& output, S32 input ) const; // const char* getRes( LLSTR_ID string_id ) const { return mStrings[ string_id ]; } |