From 3f27ba891ac4d032753b219b4b96d1ffbc9fb488 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 15 Aug 2008 23:45:16 -0500
Subject: Second Life viewer sources 1.18.5.0-RC

---
 linden/indra/llui/llresmgr.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'linden/indra/llui/llresmgr.cpp')

diff --git a/linden/indra/llui/llresmgr.cpp b/linden/indra/llui/llresmgr.cpp
index e77faa9..0e1b9bf 100644
--- a/linden/indra/llui/llresmgr.cpp
+++ b/linden/indra/llui/llresmgr.cpp
@@ -247,8 +247,10 @@ char LLResMgr::getMonetaryThousandsSeparator() const
 
 
 // Sets output to a string of integers with monetary separators inserted according to the locale.
-void LLResMgr::getMonetaryString( LLString& output, S32 input ) const
+std::string LLResMgr::getMonetaryString( S32 input ) const
 {
+	std::string output;
+
 	LLLocale locale(LLLocale::USER_LOCALE);
 	struct lconv *conv = localeconv();
 	
@@ -295,7 +297,6 @@ void LLResMgr::getMonetaryString( LLString& output, S32 input ) const
 	LLString digits = llformat("%u", abs(input));
 	if( !grouping || !grouping[0] )
 	{
-		output.assign("L$");
 		if( negative_before )
 		{
 			output.append( negative_sign );
@@ -305,7 +306,7 @@ void LLResMgr::getMonetaryString( LLString& output, S32 input ) const
 		{
 			output.append( negative_sign );
 		}
-		return;
+		return output;
 	}
 
 	S32 groupings[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
@@ -367,7 +368,6 @@ void LLResMgr::getMonetaryString( LLString& output, S32 input ) const
 		forward_output[ output_pos - 1 - i ] = reversed_output[ i ];
 	}
 
-	output.assign("L$");
 	if( negative_before )
 	{
 		output.append( negative_sign );
@@ -377,6 +377,7 @@ void LLResMgr::getMonetaryString( LLString& output, S32 input ) const
 	{
 		output.append( negative_sign );
 	}
+	return output;
 }
 
 void LLResMgr::getIntegerString( LLString& output, S32 input ) const
-- 
cgit v1.1