diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-10-20 15:03:42 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-10-20 15:03:42 -0400 |
| commit | 78900b46431c8126333917ee38292d7ada091562 (patch) | |
| tree | 33d9dc97a3ed0280146bd7c316544de303e0505e | |
| parent | c7e02dd3f75d6431ecd28f2d1cab3a40b8bf77fd (diff) | |
| parent | 04eb6f0ef4e5b00103ea9f2b011ca709be8a1ef2 (diff) | |
merge changes for storm-910
| -rw-r--r-- | doc/contributions.txt | 3 | ||||
| -rw-r--r-- | indra/newview/llpanelgrouplandmoney.cpp | 5 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_group_land_money.xml | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/strings.xml | 2 |
4 files changed, 7 insertions, 4 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index 66b3237e63..6b95f3e1c9 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -577,8 +577,9 @@ Jonathan Yap STORM-1574 STORM-1579 STORM-1639 + STORM-910 Kadah Coba - STORM-1060 + STORM-1060 Jondan Lundquist Josef Munster Josette Windlow diff --git a/indra/newview/llpanelgrouplandmoney.cpp b/indra/newview/llpanelgrouplandmoney.cpp index eddd6e554d..8477219f87 100644 --- a/indra/newview/llpanelgrouplandmoney.cpp +++ b/indra/newview/llpanelgrouplandmoney.cpp @@ -1435,6 +1435,7 @@ void LLGroupMoneyPlanningTabEventHandler::processReply(LLMessageSystem* msg, LLStringUtil::format (time_str, substitution); text.append(time_str); + text.append(". "); if (current_interval == 0) { @@ -1445,8 +1446,8 @@ void LLGroupMoneyPlanningTabEventHandler::processReply(LLMessageSystem* msg, LLStringUtil::format (time_str, substitution); text.append(time_str); - text.append("\n\n"); - text.append(llformat("%-24sL$%6d\n", LLTrans::getString("GroupMoneyBalance").c_str(), balance )); + text.append(".\n\n"); + text.append(llformat("%-23sL$%6d\n", LLTrans::getString("GroupMoneyBalance").c_str(), balance )); text.append(1, '\n'); } diff --git a/indra/newview/skins/default/xui/en/panel_group_land_money.xml b/indra/newview/skins/default/xui/en/panel_group_land_money.xml index eff674c628..d4da55e32e 100644 --- a/indra/newview/skins/default/xui/en/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/en/panel_group_land_money.xml @@ -272,6 +272,7 @@ top="0" width="313"> <text_editor + font="Monospace" enabled="false" type="string" follows="all" diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml index 78e10d207c..db7c07f2f8 100644 --- a/indra/newview/skins/default/xui/en/strings.xml +++ b/indra/newview/skins/default/xui/en/strings.xml @@ -2269,7 +2269,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> |