From 2455a4bb00b399e5cd5f22e9b177ca2aeaad2ba2 Mon Sep 17 00:00:00 2001
From: Seth ProductEngine <slitovchuk@productengine.com>
Date: Wed, 21 Dec 2011 14:09:56 +0200
Subject: EXP-1695 FIXED currency format in Group Profile > Land/Asset and New
 Group.

---
 indra/newview/llpanelgrouplandmoney.cpp                    |  3 +--
 indra/newview/skins/default/xui/en/panel_group_general.xml | 13 +++++++++++--
 indra/newview/skins/default/xui/en/strings.xml             |  2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/indra/newview/llpanelgrouplandmoney.cpp b/indra/newview/llpanelgrouplandmoney.cpp
index e66dd5690c..b6c0c2ee24 100644
--- a/indra/newview/llpanelgrouplandmoney.cpp
+++ b/indra/newview/llpanelgrouplandmoney.cpp
@@ -1447,8 +1447,7 @@ void LLGroupMoneyPlanningTabEventHandler::processReply(LLMessageSystem* msg,
 
 		text.append(time_str);
 		text.append(".\n\n");
-		text.append(llformat("%-23sL$%6d\n", LLTrans::getString("GroupMoneyBalance").c_str(), balance ));
-		text.append(1, '\n');
+		text.append(llformat("%-24s %6d L$\n\n", LLTrans::getString("GroupMoneyBalance").c_str(), balance ));
 	}
 
 	// [DEV-29503] Hide the individual info since
diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml
index 38b680ba86..adde982c60 100644
--- a/indra/newview/skins/default/xui/en/panel_group_general.xml
+++ b/indra/newview/skins/default/xui/en/panel_group_general.xml
@@ -225,13 +225,22 @@ Hover your mouse over the options for more help.
          height="23"
          increment="1"
          label_width="15"
-         label="L$"
          layout="topleft"
          max_val="99999"
          left="30"
          name="spin_enrollment_fee"
          tool_tip="New members must pay this fee to join the group when Enrollment Fee is checked."
-         width="170" />
+         width="150" />
+        <text
+         follows="left|top"
+         type="string"
+         height="16"
+         left_pad="2"
+         name="currency_label"
+         top_delta="5"
+         width="18">
+         L$
+        </text>
         <combo_box
          follows="left|top"
          height="23"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index c25d1f57d6..ac5b027ea1 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2271,7 +2271,7 @@ Returns a string with the requested data about the region
 	<string name="NextStipendDay"       value="The next stipend day is " />
 	<string name="GroupPlanningDate">[mthnum,datetime,utc]/[day,datetime,utc]/[year,datetime,utc]</string>
 	<string name="GroupIndividualShare" value="                      Group       Individual Share" />
-	<string name="GroupColumn"          value="                      Group" />
+	<string name="GroupColumn"          value="Group" />
 	<string name="Balance">Balance</string>
 	<string name="Credits">Credits</string>
 	<string name="Debits">Debits</string>
-- 
cgit v1.2.3