Ported currency changes from Hippo (#237) and fixed some labels Hippo missed (also fixed #200 in the process)

1 files changed, 18 insertions, 8 deletions

diff --git a/linden/indra/newview/llpanelpermissions.cpp b/linden/indra/newview/llpanelpermissions.cpp
index 0cb5b9e..cd1aee7 100644
--- a/linden/indra/newview/llpanelpermissions.cpp
+++ b/linden/indra/newview/llpanelpermissions.cpp
@@ -65,6 +65,8 @@
 #include "lluictrlfactory.h"
 #include "roles_constants.h"
 
+#include "hippoGridManager.h"
+
 ///----------------------------------------------------------------------------
 /// Class llpanelpermissions
 ///----------------------------------------------------------------------------
@@ -134,6 +136,9 @@ LLPanelPermissions::~LLPanelPermissions()
 
 void LLPanelPermissions::refresh()
 {
+        LLStringUtil::format_map_t argsCurrency;
+        argsCurrency["[CURRENCY]"] = gHippoGridManager->getConnectedGrid()->getCurrencySymbol();
+
         LLButton*       BtnDeedToGroup = getChild<LLButton>("button deed");
         if(BtnDeedToGroup)
         {       
@@ -234,7 +239,7 @@ void LLPanelPermissions::refresh()
                 }
                 
                 childSetEnabled("Cost",false);
-                childSetText("Cost",getString("Cost Default"));
+                childSetText("Cost", getString("Cost Default", argsCurrency));
                 childSetText("Edit Cost",LLStringUtil::null);
                 childSetEnabled("Edit Cost",false);
                 
@@ -465,11 +470,11 @@ void LLPanelPermissions::refresh()
                 // If there are multiple items for sale then set text to PRICE PER UNIT.
                 if (num_for_sale > 1)
                 {
-                        childSetText("Cost",getString("Cost Per Unit"));
+                        childSetText("Cost",getString("Cost Per Unit", argsCurrency));
                 }
                 else
                 {
-                        childSetText("Cost",getString("Cost Default"));
+                        childSetText("Cost",getString("Cost Default", argsCurrency));
                 }
                 
                 LLLineEditor *editPrice = getChild<LLLineEditor>("Edit Cost");
@@ -510,15 +515,15 @@ void LLPanelPermissions::refresh()
 
                 // If multiple items are for sale, set text to TOTAL PRICE.
                 if (num_for_sale > 1)
-                        childSetText("Cost",getString("Cost Total"));
+                        childSetText("Cost", getString("Cost Total", argsCurrency));
                 else
-                        childSetText("Cost",getString("Cost Default"));
+                        childSetText("Cost", getString("Cost Default", argsCurrency));
         }
         // This is a public object.
         else
         {
                 childSetEnabled("Cost",false);
-                childSetText("Cost",getString("Cost Default"));
+                childSetText("Cost", getString("Cost Default", argsCurrency));
                 
                 childSetText("Edit Cost",LLStringUtil::null);
                 childSetEnabled("Edit Cost",false);
@@ -954,7 +959,9 @@ bool callback_deed_to_group(const LLSD& notification, const LLSD& response)
 
 void LLPanelPermissions::onClickDeedToGroup(void* data)
 {
-        LLNotifications::instance().add( "DeedObjectToGroup", LLSD(), LLSD(), callback_deed_to_group);
+        LLSD args;
+        args["CURRENCY"] = gHippoGridManager->getConnectedGrid()->getCurrencySymbol();
+        LLNotifications::instance().add( "DeedObjectToGroup", args, LLSD(), callback_deed_to_group);
 }
 
 ///----------------------------------------------------------------------------
@@ -1060,6 +1067,9 @@ void LLPanelPermissions::setAllSaleInfo()
         llinfos << "LLPanelPermissions::setAllSaleInfo()" << llendl;
         LLSaleInfo::EForSale sale_type = LLSaleInfo::FS_NOT;
 
+        LLStringUtil::format_map_t argsCurrency;
+        argsCurrency["[CURRENCY]"] = gHippoGridManager->getConnectedGrid()->getCurrencySymbol();
+
         LLCheckBoxCtrl *checkPurchase = getChild<LLCheckBoxCtrl>("checkbox for sale");
         
         // Set the sale type if the object(s) are for sale.
@@ -1093,7 +1103,7 @@ void LLPanelPermissions::setAllSaleInfo()
         {
                 // Don't extract the price if it's labeled as MIXED or is empty.
                 const std::string& editPriceString = editPrice->getText();
-                if (editPriceString != getString("Cost Mixed") &&
+                if (editPriceString != getString("Cost Mixed", argsCurrency) &&
                         !editPriceString.empty())
                 {
                         price = atoi(editPriceString.c_str());