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

66 files changed, 606 insertions, 406 deletions

diff --git a/linden/indra/llinventory/lltransactionflags.cpp b/linden/indra/llinventory/lltransactionflags.cpp
index e0f87aa..aaea161 100644
--- a/linden/indra/llinventory/lltransactionflags.cpp
+++ b/linden/indra/llinventory/lltransactionflags.cpp
@@ -36,7 +36,9 @@
 #include "lluuid.h"
 #include "lltransactionflags.h"
 #include "lltransactiontypes.h"
- 
+
+#include "../newview/hippoGridManager.h"
+
 const U8 TRANSACTION_FLAGS_NONE = 0;
 const U8 TRANSACTION_FLAG_SOURCE_GROUP = 1;
 const U8 TRANSACTION_FLAG_DEST_GROUP = 2;
@@ -114,7 +116,7 @@ std::string build_transfer_message_to_source(
         std::ostringstream ostr;
         if(dest_id.isNull())
         {
-                ostr << "You paid L$" << amount;
+                ostr << "You paid " << gHippoGridManager->getConnectedGrid()->getCurrencySymbol() << amount;
                 switch(transaction_type)
                 {
                 case TRANS_GROUP_CREATE:
@@ -132,7 +134,7 @@ std::string build_transfer_message_to_source(
         }
         else
         {
-                ostr << "You paid " << dest_name << " L$" << amount;
+                ostr << "You paid " << dest_name << ' ' << gHippoGridManager->getConnectedGrid()->getCurrencySymbol() << amount;
                 append_reason(ostr, transaction_type, description);
         }
         ostr << ".";
@@ -160,7 +162,7 @@ std::string build_transfer_message_to_destination(
                 return description;
         }
         std::ostringstream ostr;
-        ostr << source_name << " paid you L$" << amount;
+        ostr << source_name << " paid you " << gHippoGridManager->getConnectedGrid()->getCurrencySymbol() << amount;
         append_reason(ostr, transaction_type, description);
         ostr << ".";
         return ostr.str();
diff --git a/linden/indra/llui/llnotifications.cpp b/linden/indra/llui/llnotifications.cpp
index 58ec511..0b8bbbe 100644
--- a/linden/indra/llui/llnotifications.cpp
+++ b/linden/indra/llui/llnotifications.cpp
@@ -40,6 +40,8 @@
 #include <algorithm>
 #include <boost/regex.hpp>
 
+#include "../newview/hippoGridManager.h"
+
 
 const std::string NOTIFICATION_PERSIST_VERSION = "0.93";
 
@@ -605,9 +607,9 @@ void LLNotification::init(const std::string& template_name, const LLSD& form_ele
         mSubstitutions["[VIEWER_NAME]"] = LLNotifications::instance().getGlobalString("VIEWER_NAME");
         mSubstitutions["[VIEWER_SITE]"] = LLNotifications::instance().getGlobalString("VIEWER_SITE");
 
-        // TODO: set these based on which grid the user is connected to.
-        mSubstitutions["[GRID_NAME]"] = LLNotifications::instance().getGlobalString("SECOND_LIFE");
-        mSubstitutions["[GRID_SITE]"] = LLNotifications::instance().getGlobalString("SECOND_LIFE_SITE");
+        mSubstitutions["[GRID_NAME]"] = gHippoGridManager->getConnectedGrid()->getGridName();
+        mSubstitutions["[GRID_SITE]"] = gHippoGridManager->getConnectedGrid()->getWebSite();
+        mSubstitutions["[CURRENCY]"] = gHippoGridManager->getConnectedGrid()->getCurrencySymbol();
 
         mSubstitutions["_URL"] = getURL();
         mSubstitutions["_NAME"] = template_name;
diff --git a/linden/indra/newview/hippoGridManager.cpp b/linden/indra/newview/hippoGridManager.cpp
index 9acdd69..60c33e8 100644
--- a/linden/indra/newview/hippoGridManager.cpp
+++ b/linden/indra/newview/hippoGridManager.cpp
@@ -13,6 +13,7 @@
 #include <llfile.h>
 #include <llhttpclient.h>
 #include <llsdserialize.h>
+#include "lltrans.h"
 #include "llviewercontrol.h"
 #include "llweb.h"
 
@@ -441,14 +442,14 @@ std::string HippoGridInfo::getDirectoryFee() const
 {
     std::string fee;
     formatFee(fee, mDirectoryFee, true);
-    if (fee != "free") fee += "/week";
+        if (fee != LLTrans::getString("hippo_label_free")) fee += "/" + LLTrans::getString("hippo_label_week");
     return fee;
 }
 
 void HippoGridInfo::formatFee(std::string &fee, int cost, bool showFree) const
 {
     if (showFree && (cost == 0)) {
-        fee = "free";
+        fee = LLTrans::getString("hippo_label_free");
     } else {
         fee = llformat("%s%d", getCurrencySymbol().c_str(), cost);
     }
diff --git a/linden/indra/newview/llassetuploadresponders.cpp b/linden/indra/newview/llassetuploadresponders.cpp
index 001d2e9..aff1fb8 100644
--- a/linden/indra/newview/llassetuploadresponders.cpp
+++ b/linden/indra/newview/llassetuploadresponders.cpp
@@ -63,6 +63,8 @@
 #include "llscrolllistctrl.h"
 #include "llsdserialize.h"
 
+#include "hippoGridManager.h"
+
 // When uploading multiple files, don't display any of them when uploading more than this number.
 static const S32 FILE_COUNT_DISPLAY_THRESHOLD = 5;
 
@@ -227,6 +229,7 @@ void LLNewAgentInventoryResponder::uploadComplete(const LLSD& content)
 
                 LLSD args;
                 args["AMOUNT"] = llformat("%d", expected_upload_cost);
+                args["CURRENCY"] = gHippoGridManager->getConnectedGrid()->getCurrencySymbol();
                 LLNotifications::instance().add("UploadPayment", args);
         }
 
diff --git a/linden/indra/newview/llcurrencyuimanager.cpp b/linden/indra/newview/llcurrencyuimanager.cpp
index 8682124..99d0430 100644
--- a/linden/indra/newview/llcurrencyuimanager.cpp
+++ b/linden/indra/newview/llcurrencyuimanager.cpp
@@ -47,6 +47,7 @@
 #include "llxmlrpctransaction.h"
 #include "llviewernetwork.h"
 
+#include "hippoGridManager.h"
 
 const F64 CURRENCY_ESTIMATE_FREQUENCY = 2.0;
         // how long of a pause in typing a currency buy amount before an
@@ -238,17 +239,11 @@ void LLCurrencyUIManager::Impl::finishCurrencyBuy()
 void LLCurrencyUIManager::Impl::startTransaction(TransactionType type,
                 const char* method, LLXMLRPCValue params)
 {
-        static std::string transactionURI;
-        if (transactionURI.empty())
-        {
-                transactionURI = LLViewerLogin::getInstance()->getHelperURI() + "currency.php";
-        }
-
         delete mTransaction;
 
         mTransactionType = type;
         mTransaction = new LLXMLRPCTransaction(
-                transactionURI,
+                LLViewerLogin::getInstance()->getHelperURI() + "currency.php",
                 method,
                 params,
                 false /* don't use gzip */
@@ -372,6 +367,7 @@ void LLCurrencyUIManager::Impl::updateUI()
         }
 
         mPanel.childShow("currency_action");
+        mPanel.childSetTextArg("currency_action", "[CURRENCY]", gHippoGridManager->getConnectedGrid()->getCurrencySymbol());
 
         LLLineEditor* lindenAmount = mPanel.getChild<LLLineEditor>("currency_amt");
         if (lindenAmount) 
@@ -478,7 +474,9 @@ void LLCurrencyUIManager::buy(const std::string& buy_msg)
 
         LLUIString msg = buy_msg;
         msg.setArg("[LINDENS]", llformat("%d", impl.mUserCurrencyBuy));
+        msg.setArg("[CURRENCY]", gHippoGridManager->getConnectedGrid()->getCurrencySymbol());
         msg.setArg("[USD]", llformat("%#.2f", impl.mSiteCurrencyEstimatedCost / 100.0));
+        msg.setArg("[REALCURRENCY]", gHippoGridManager->getConnectedGrid()->getRealCurrencySymbol());
         LLConfirmationManager::confirm(impl.mSiteConfirm,
                                                                    msg,
                                                                    impl,
diff --git a/linden/indra/newview/llfirstuse.cpp b/linden/indra/newview/llfirstuse.cpp
index bc982af..34e3fcc 100644
--- a/linden/indra/newview/llfirstuse.cpp
+++ b/linden/indra/newview/llfirstuse.cpp
@@ -46,6 +46,7 @@
 #include "lltracker.h"
 
 #include "llvoavatar.h"
+#include "hippoGridManager.h"
 
 // [RLVa:KB] - Version: 1.22.11
 #include "llviewerwindow.h"
@@ -94,6 +95,7 @@ void LLFirstUse::useBalanceIncrease(S32 delta)
 
                 LLSD args;
                 args["AMOUNT"] = llformat("%d",delta);
+                args["CURRENCY"] = gHippoGridManager->getConnectedGrid()->getCurrencySymbol();
                 LLNotifications::instance().add("FirstBalanceIncrease", args);
         }
 }
@@ -108,6 +110,7 @@ void LLFirstUse::useBalanceDecrease(S32 delta)
 
                 LLSD args;
                 args["AMOUNT"] = llformat("%d",-delta);
+                args["CURRENCY"] = gHippoGridManager->getConnectedGrid()->getCurrencySymbol();
                 LLNotifications::instance().add("FirstBalanceDecrease", args);
         }
 }
diff --git a/linden/indra/newview/llfloateranimpreview.cpp b/linden/indra/newview/llfloateranimpreview.cpp
index 57ee161..a7d880e 100644
--- a/linden/indra/newview/llfloateranimpreview.cpp
+++ b/linden/indra/newview/llfloateranimpreview.cpp
@@ -67,6 +67,8 @@
 #include "pipeline.h"
 #include "lluictrlfactory.h"
 
+#include "hippoGridManager.h"
+
 S32 LLFloaterAnimPreview::sUploadAmount = 10;
 
 const S32 PREVIEW_BORDER_WIDTH = 2;
@@ -162,7 +164,7 @@ BOOL LLFloaterAnimPreview::postBuild()
 
         childSetCommitCallback("name_form", onCommitName, this);
 
-        childSetLabelArg("ok_btn", "[AMOUNT]", llformat("%d",sUploadAmount));
+        childSetLabelArg("ok_btn", "[UPLOADFEE]", gHippoGridManager->getConnectedGrid()->getUploadFee());
         childSetAction("ok_btn", onBtnOK, this);
         setDefaultBtn();
 
diff --git a/linden/indra/newview/llfloaterbuy.cpp b/linden/indra/newview/llfloaterbuy.cpp
index a33cabc..86cab43 100644
--- a/linden/indra/newview/llfloaterbuy.cpp
+++ b/linden/indra/newview/llfloaterbuy.cpp
@@ -50,6 +50,8 @@
 #include "lluictrlfactory.h"
 #include "llviewerwindow.h"
 
+#include "hippoGridManager.h"
+
 LLFloaterBuy* LLFloaterBuy::sInstance = NULL;
 
 LLFloaterBuy::LLFloaterBuy()
@@ -184,6 +186,7 @@ void LLFloaterBuy::show(const LLSaleInfo& sale_info)
         // Add after columns added so appropriate heights are correct.
         object_list->addElement(row);
 
+        sInstance->childSetTextArg("buy_text", "[CURRENCY]", gHippoGridManager->getConnectedGrid()->getCurrencySymbol());
         sInstance->childSetTextArg("buy_text", "[AMOUNT]", llformat("%d", sale_info.getSalePrice()));
         sInstance->childSetTextArg("buy_text", "[NAME]", owner_name);
 
diff --git a/linden/indra/newview/llfloaterbuycontents.cpp b/linden/indra/newview/llfloaterbuycontents.cpp
index 95a8caa..498d6ac 100644
--- a/linden/indra/newview/llfloaterbuycontents.cpp
+++ b/linden/indra/newview/llfloaterbuycontents.cpp
@@ -54,6 +54,8 @@
 #include "lluictrlfactory.h"
 #include "llviewerwindow.h"
 
+#include "hippoGridManager.h"
+
 LLFloaterBuyContents* LLFloaterBuyContents::sInstance = NULL;
 
 LLFloaterBuyContents::LLFloaterBuyContents()
@@ -129,6 +131,7 @@ void LLFloaterBuyContents::show(const LLSaleInfo& sale_info)
         }
 
         sInstance->childSetTextArg("contains_text", "[NAME]", node->mName);
+        sInstance->childSetTextArg("buy_text", "[CURRENCY]", gHippoGridManager->getConnectedGrid()->getCurrencySymbol());
         sInstance->childSetTextArg("buy_text", "[AMOUNT]", llformat("%d", sale_info.getSalePrice()));
         sInstance->childSetTextArg("buy_text", "[NAME]", owner_name);
 
diff --git a/linden/indra/newview/llfloaterbuycurrency.cpp b/linden/indra/newview/llfloaterbuycurrency.cpp
index cfbc5da..07723e0 100644
--- a/linden/indra/newview/llfloaterbuycurrency.cpp
+++ b/linden/indra/newview/llfloaterbuycurrency.cpp
@@ -46,6 +46,8 @@
 #include "llwindow.h"
 #include "llappviewer.h"
 
+#include "hippoGridManager.h"
+
 static const S32 STANDARD_BUY_AMOUNT = 2000;
 static const S32 MINIMUM_BALANCE_AMOUNT = 0;
 
@@ -263,9 +265,11 @@ void LLFloaterBuyCurrencyUI::updateUI()
                                 childSetVisible("buy_action", true);
                                 childSetTextArg("buy_action", "[NAME]", mTargetName);
                                 childSetTextArg("buy_action", "[PRICE]", llformat("%d",mTargetPrice));
+                                childSetTextArg("buy_action", "[CURRENCY]", gHippoGridManager->getConnectedGrid()->getCurrencySymbol());
                         }
                         else
                         {
+                                childSetTextArg("buy_action_unknown", "[CURRENCY]", gHippoGridManager->getConnectedGrid()->getCurrencySymbol());
                                 childSetVisible("buy_action_unknown", true);
                         }
                 }
@@ -274,16 +278,21 @@ void LLFloaterBuyCurrencyUI::updateUI()
                 childShow("balance_label");
                 childShow("balance_amount");
                 childSetTextArg("balance_amount", "[AMT]", llformat("%d", balance));
+                childSetTextArg("balance_amount", "[CURRENCY]", gHippoGridManager->getConnectedGrid()->getCurrencySymbol());
                 
                 S32 buying = mManager.getAmount();
                 childShow("buying_label");
                 childShow("buying_amount");
                 childSetTextArg("buying_amount", "[AMT]", llformat("%d", buying));
+                childSetTextArg("buying_amount", "[CURRENCY]", gHippoGridManager->getConnectedGrid()->getCurrencySymbol());
                 
                 S32 total = balance + buying;
                 childShow("total_label");
                 childShow("total_amount");
                 childSetTextArg("total_amount", "[AMT]", llformat("%d", total));
+                childSetTextArg("total_amount", "[CURRENCY]", gHippoGridManager->getConnectedGrid()->getCurrencySymbol());
+
+                childSetTextArg("currency_est", "[REALCURRENCY]", gHippoGridManager->getConnectedGrid()->getRealCurrencySymbol());
 
                 childSetVisible("purchase_warning_repurchase", false);
                 childSetVisible("purchase_warning_notenough", false);
diff --git a/linden/indra/newview/llfloaterbuyland.cpp b/linden/indra/newview/llfloaterbuyland.cpp
index 29506e2..75630b2 100644
--- a/linden/indra/newview/llfloaterbuyland.cpp
+++ b/linden/indra/newview/llfloaterbuyland.cpp
@@ -66,6 +66,8 @@
 #include "llviewernetwork.h"
 #include "roles_constants.h"
 
+#include "hippoGridManager.h"
+
 // NOTE: This is duplicated in lldatamoney.cpp ...
 const F32 GROUP_LAND_BONUS_FACTOR = 1.1f;
 const F64 CURRENCY_ESTIMATE_FREQUENCY = 0.5;
@@ -1024,6 +1026,7 @@ void LLFloaterBuyLandUI::refreshUI()
                         LLStringUtil::format_map_t string_args;
                         string_args["[AMOUNT]"] = llformat("%d", mParcelActualArea);
                         string_args["[AMOUNT2]"] = llformat("%d", mParcelSupportedObjects);
+                        string_args["[CURRENCY]"] = gHippoGridManager->getConnectedGrid()->getCurrencySymbol();
                 
                         childSetText("info_size", getString("meters_supports_object", string_args));
 
@@ -1227,7 +1230,8 @@ void LLFloaterBuyLandUI::refreshUI()
                         
                 childSetText("purchase_action",
                         llformat(
-                                "Pay L$ %d to %s for this land",
+                                "Pay %s %d to %s for this land",
+                                gHippoGridManager->getConnectedGrid()->getCurrencySymbol().c_str(),
                                 mParcelPrice,
                                 mParcelSellerName.c_str()
                                 ));
@@ -1239,6 +1243,7 @@ void LLFloaterBuyLandUI::refreshUI()
                 {
                         LLStringUtil::format_map_t string_args;
                         string_args["[AMOUNT]"] = llformat("%d", mAgentCashBalance);
+                        string_args["[CURRENCY]"] = gHippoGridManager->getConnectedGrid()->getCurrencySymbol();
 
                         childSetText("currency_reason", getString("have_enough_lindens", string_args));
                 }
@@ -1247,6 +1252,7 @@ void LLFloaterBuyLandUI::refreshUI()
                         LLStringUtil::format_map_t string_args;
                         string_args["[AMOUNT]"] = llformat("%d", mAgentCashBalance);
                         string_args["[AMOUNT2]"] = llformat("%d", mParcelPrice - mAgentCashBalance);
+                        string_args["[CURRENCY]"] = gHippoGridManager->getConnectedGrid()->getCurrencySymbol();
                         
                         childSetText("currency_reason", getString("not_enough_lindens", string_args));
 
@@ -1257,6 +1263,7 @@ void LLFloaterBuyLandUI::refreshUI()
                 {
                         LLStringUtil::format_map_t string_args;
                         string_args["[AMOUNT]"] = llformat("%d", finalBalance);
+                        string_args["[CURRENCY]"] = gHippoGridManager->getConnectedGrid()->getCurrencySymbol();
 
                         childSetText("currency_balance", getString("balance_left", string_args));
 
@@ -1265,6 +1272,7 @@ void LLFloaterBuyLandUI::refreshUI()
                 {
                         LLStringUtil::format_map_t string_args;
                         string_args["[AMOUNT]"] = llformat("%d", mParcelPrice - mAgentCashBalance);
+                        string_args["[CURRENCY]"] = gHippoGridManager->getConnectedGrid()->getCurrencySymbol();
         
                         childSetText("currency_balance", getString("balance_needed", string_args));
                         
@@ -1331,6 +1339,7 @@ void LLFloaterBuyLandUI::startBuyPreConfirm()
                 LLStringUtil::format_map_t string_args;
                 string_args["[AMOUNT]"] = llformat("%d", mCurrency.getAmount());
                 string_args["[AMOUNT2]"] = llformat("%#.2f", mCurrency.getEstimate() / 100.0);
+                string_args["[CURRENCY]"] = gHippoGridManager->getConnectedGrid()->getCurrencySymbol();
                 
                 action += getString("buy_for_US", string_args);
         }
@@ -1338,6 +1347,7 @@ void LLFloaterBuyLandUI::startBuyPreConfirm()
         LLStringUtil::format_map_t string_args;
         string_args["[AMOUNT]"] = llformat("%d", mParcelPrice);
         string_args["[SELLER]"] = mParcelSellerName;
+        string_args["[CURRENCY]"] = gHippoGridManager->getConnectedGrid()->getCurrencySymbol();
         action += getString("pay_to_for_land", string_args);
                 
         
diff --git a/linden/indra/newview/llfloaterimagepreview.cpp b/linden/indra/newview/llfloaterimagepreview.cpp
index 87d577d..9827a31 100644
--- a/linden/indra/newview/llfloaterimagepreview.cpp
+++ b/linden/indra/newview/llfloaterimagepreview.cpp
@@ -60,6 +60,8 @@
 #include "llstring.h"
 #include "llviewercontrol.h"
 
+#include "hippoGridManager.h"
+
 //static
 S32 LLFloaterImagePreview::sUploadAmount = 10;
 
@@ -94,7 +96,7 @@ BOOL LLFloaterImagePreview::postBuild()
                 return FALSE;
         }
 
-        childSetLabelArg("ok_btn", "[AMOUNT]", llformat("%d",sUploadAmount));
+        childSetLabelArg("ok_btn", "[UPLOADFEE]", gHippoGridManager->getConnectedGrid()->getUploadFee());
 
         LLCtrlSelectionInterface* iface = childGetSelectionInterface("clothing_type_combo");
         if (iface)
diff --git a/linden/indra/newview/llfloaterland.cpp b/linden/indra/newview/llfloaterland.cpp
index 08c04ab..cc398da 100644
--- a/linden/indra/newview/llfloaterland.cpp
+++ b/linden/indra/newview/llfloaterland.cpp
@@ -76,6 +76,8 @@
 #include "llviewercontrol.h"
 #include "roles_constants.h"
 
+#include "hippoGridManager.h"
+
 static std::string OWNER_ONLINE         = "0";
 static std::string OWNER_OFFLINE        = "1";
 static std::string OWNER_GROUP          = "2";
@@ -645,6 +647,7 @@ void LLPanelLandGeneral::refresh()
                                 mSaleInfoForSaleNoObjects->setVisible(TRUE);
                         }
                         mSaleInfoNotForSale->setVisible(FALSE);
+                        mSaleInfoForSale1->setTextArg("[CURRENCY]", gHippoGridManager->getConnectedGrid()->getCurrencySymbol());
 
                         F32 cost_per_sqm = 0.0f;
                         if (area > 0)
@@ -887,6 +890,7 @@ void LLPanelLandGeneral::onClickBuyPass(void* data)
 
         LLSD args;
         args["COST"] = cost;
+        args["CURRENCY"] = gHippoGridManager->getConnectedGrid()->getCurrencySymbol();
         args["PARCEL_NAME"] = parcel_name;
         args["TIME"] = time;
         
@@ -2068,6 +2072,7 @@ void LLPanelLandOptions::refreshSearch()
         }
         BOOL show_directory = parcel->getParcelFlag(PF_SHOW_DIRECTORY);
         mCheckShowDirectory     ->set(show_directory);
+        mCheckShowDirectory->setLabelArg("[DIRECTORYFEE]", gHippoGridManager->getConnectedGrid()->getDirectoryFee());
 
         // Set by string in case the order in UI doesn't match the order by index.
         // *TODO:Translate
@@ -2435,6 +2440,7 @@ void LLPanelLandAccess::refresh()
                 
                 S32 pass_price = parcel->getPassPrice();
                 childSetValue( "PriceSpin", (F32)pass_price );
+                childSetLabelArg("PriceSpin", "[CURRENCY]", gHippoGridManager->getConnectedGrid()->getCurrencySymbol());
 
                 F32 pass_hours = parcel->getPassHours();
                 childSetValue( "HoursSpin", pass_hours );
diff --git a/linden/indra/newview/llfloaternamedesc.cpp b/linden/indra/newview/llfloaternamedesc.cpp
index acfcfab..9413611 100644
--- a/linden/indra/newview/llfloaternamedesc.cpp
+++ b/linden/indra/newview/llfloaternamedesc.cpp
@@ -55,6 +55,8 @@
 #include "llassetstorage.h"
 #include "llinventorytype.h"
 
+#include "hippoGridManager.h"
+
 const S32 PREVIEW_LINE_HEIGHT = 19;
 const S32 PREVIEW_CLOSE_BOX_SIZE = 16;
 const S32 PREVIEW_BORDER_WIDTH = 2;
@@ -138,6 +140,7 @@ BOOL LLFloaterNameDesc::postBuild()
         childSetAction("cancel_btn", onBtnCancel, this);
 
         // OK button
+        childSetLabelArg("ok_btn", "[UPLOADFEE]", gHippoGridManager->getConnectedGrid()->getUploadFee());
         childSetAction("ok_btn", onBtnOK, this);
         setDefaultBtn("ok_btn");
 
diff --git a/linden/indra/newview/llfloaterpostcard.cpp b/linden/indra/newview/llfloaterpostcard.cpp
index b0ab0f9..41b6515 100644
--- a/linden/indra/newview/llfloaterpostcard.cpp
+++ b/linden/indra/newview/llfloaterpostcard.cpp
@@ -66,6 +66,8 @@
 
 #include <boost/regex.hpp>  //boost.regex lib
 
+#include "hippoGridManager.h"
+
 ///----------------------------------------------------------------------------
 /// Local function declarations, constants, enums, and typedefs
 ///----------------------------------------------------------------------------
@@ -355,6 +357,7 @@ bool LLFloaterPostcard::missingSubjMsgAlertCallback(const LLSD& notification, co
                 if((childGetValue("subject_form").asString()).empty())
                 {
                         // Stuff the subject back into the form.
+                        childSetTextArg("default_subject", "[GRID_NAME]", gHippoGridManager->getConnectedGrid()->getGridName());
                         childSetValue("subject_form", getString("default_subject"));
                 }
 
diff --git a/linden/indra/newview/llfloaterproperties.cpp b/linden/indra/newview/llfloaterproperties.cpp
index 3059843..7dc6e42 100644
--- a/linden/indra/newview/llfloaterproperties.cpp
+++ b/linden/indra/newview/llfloaterproperties.cpp
@@ -59,6 +59,8 @@
 
 #include "lluictrlfactory.h"
 
+#include "hippoGridManager.h"
+
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // Class LLPropertiesObserver
@@ -164,6 +166,8 @@ LLFloaterProperties::LLFloaterProperties(const std::string& name, const LLRect&
                 sPropertiesObserver = new LLPropertiesObserver;
         }
         sPropertiesObserverCount++;
+
+        childSetTextArg("TextPrice", "[CURRENCY]", gHippoGridManager->getConnectedGrid()->getCurrencySymbol());
         
         // add the object to the static structure
         LLUUID key = mItemID ^ mObjectID;
diff --git a/linden/indra/newview/llfloatersellland.cpp b/linden/indra/newview/llfloatersellland.cpp
index 92e070f..bf4a4c3 100644
--- a/linden/indra/newview/llfloatersellland.cpp
+++ b/linden/indra/newview/llfloatersellland.cpp
@@ -46,6 +46,8 @@
 #include "lluictrlfactory.h"
 #include "llviewerwindow.h"
 
+#include "hippoGridManager.h"
+
 // defined in llfloaterland.cpp
 void send_parcel_select_objects(S32 parcel_local_id, S32 return_type,
                                                                 uuid_list_t* return_ids = NULL);
@@ -284,6 +286,8 @@ void LLFloaterSellLandUI::refreshUI()
         childSetText("info_parcel", parcelp->getName());
         childSetTextArg("info_size", "[AREA]", llformat("%d", mParcelActualArea));
 
+        childSetTextArg("price_ld", "[CURRENCY]", gHippoGridManager->getConnectedGrid()->getCurrencySymbol());
+
         std::string price_str = childGetValue("price").asString();
         bool valid_price = false;
         valid_price = (price_str != "") && LLLineEditor::prevalidateNonNegativeS32(utf8str_to_wstring(price_str));
diff --git a/linden/indra/newview/llfloatersnapshot.cpp b/linden/indra/newview/llfloatersnapshot.cpp
index b4f2cc2..f67340e 100644
--- a/linden/indra/newview/llfloatersnapshot.cpp
+++ b/linden/indra/newview/llfloatersnapshot.cpp
@@ -77,6 +77,8 @@
 #include "llvfile.h"
 #include "llvfs.h"
 
+#include "hippoGridManager.h"
+
 ///----------------------------------------------------------------------------
 /// Local function declarations, constants, enums, and typedefs
 ///----------------------------------------------------------------------------
@@ -1256,6 +1258,21 @@ void LLFloaterSnapshot::Impl::updateControls(LLFloaterSnapshot* floater)
         floater->getChild<LLComboBox>("local_size_combo")->selectNthItem(gSavedSettings.getS32("SnapshotLocalLastResolution"));
         floater->getChild<LLComboBox>("local_format_combo")->selectNthItem(gSavedSettings.getS32("SnapshotFormat"));
 
+        std::string fee = gHippoGridManager->getConnectedGrid()->getUploadFee();
+        floater->childSetLabelArg("upload_btn", "[UPLOADFEE]", fee);
+
+        if (snapshot_type_radio) {
+                const child_list_t *childs = snapshot_type_radio->getChildList();
+                if (childs) {
+                        child_list_t::const_iterator it, end=childs->end();
+                        for (it=childs->begin(); it!=end; ++it) {
+                                LLRadioCtrl *ctrl = dynamic_cast<LLRadioCtrl*>(*it);
+                                if (ctrl && (ctrl->getName() == "texture"))
+                                        ctrl->setLabelArg("[UPLOADFEE]", fee);
+                        }
+                }
+        }
+
         floater->childSetVisible("upload_btn",                  shot_type == LLSnapshotLivePreview::SNAPSHOT_TEXTURE);
         floater->childSetVisible("send_btn",                    shot_type == LLSnapshotLivePreview::SNAPSHOT_POSTCARD);
         floater->childSetVisible("save_btn",                    shot_type == LLSnapshotLivePreview::SNAPSHOT_LOCAL);
diff --git a/linden/indra/newview/llgivemoney.cpp b/linden/indra/newview/llgivemoney.cpp
index 423357d..6c69334 100644
--- a/linden/indra/newview/llgivemoney.cpp
+++ b/linden/indra/newview/llgivemoney.cpp
@@ -52,6 +52,8 @@
 #include "lltransactiontypes.h"
 #include "lluictrlfactory.h"
 
+#include "hippoGridManager.h"
+
 ///----------------------------------------------------------------------------
 /// Local function declarations, constants, enums, and typedefs
 ///----------------------------------------------------------------------------
@@ -111,6 +113,7 @@ LLFloaterPay::LLFloaterPay(const std::string& name,
 
         childSetAction("fastpay 1",&LLFloaterPay::onGive,info);
         childSetVisible("fastpay 1", FALSE);
+        childSetLabelArg("fastpay 1", "[CURRENCY]", gHippoGridManager->getConnectedGrid()->getCurrencySymbol());
 
         mQuickPayButton[i] = getChild<LLButton>("fastpay 1");
         mQuickPayInfo[i] = info;
@@ -121,6 +124,7 @@ LLFloaterPay::LLFloaterPay(const std::string& name,
 
         childSetAction("fastpay 5",&LLFloaterPay::onGive,info);
         childSetVisible("fastpay 5", FALSE);
+        childSetLabelArg("fastpay 5", "[CURRENCY]", gHippoGridManager->getConnectedGrid()->getCurrencySymbol());
 
         mQuickPayButton[i] = getChild<LLButton>("fastpay 5");
         mQuickPayInfo[i] = info;
@@ -131,6 +135,7 @@ LLFloaterPay::LLFloaterPay(const std::string& name,
 
         childSetAction("fastpay 10",&LLFloaterPay::onGive,info);
         childSetVisible("fastpay 10", FALSE);
+        childSetLabelArg("fastpay 10", "[CURRENCY]", gHippoGridManager->getConnectedGrid()->getCurrencySymbol());
 
         mQuickPayButton[i] = getChild<LLButton>("fastpay 10");
         mQuickPayInfo[i] = info;
@@ -141,6 +146,7 @@ LLFloaterPay::LLFloaterPay(const std::string& name,
 
         childSetAction("fastpay 20",&LLFloaterPay::onGive,info);
         childSetVisible("fastpay 20", FALSE);
+        childSetLabelArg("fastpay 20", "[CURRENCY]", gHippoGridManager->getConnectedGrid()->getCurrencySymbol());
 
         mQuickPayButton[i] = getChild<LLButton>("fastpay 20");
         mQuickPayInfo[i] = info;
@@ -149,7 +155,7 @@ LLFloaterPay::LLFloaterPay(const std::string& name,
         
         childSetVisible("amount text", FALSE);  
         childSetVisible("currency text", FALSE);
-
+        childSetTextArg("currency text", "[CURRENCY]", gHippoGridManager->getConnectedGrid()->getCurrencySymbol());
 
         std::string last_amount;
         if(sLastAmount > 0)
@@ -246,7 +252,7 @@ void LLFloaterPay::processPayPriceReply(LLMessageSystem* msg, void **userdata)
                         msg->getS32Fast(_PREHASH_ButtonData,_PREHASH_PayButton,pay_button,i);
                         if (pay_button > 0)
                         {
-                                std::string button_str = "L$";
+                                std::string button_str = gHippoGridManager->getConnectedGrid()->getCurrencySymbol();
                                 button_str += LLResMgr::getInstance()->getMonetaryString( pay_button );
 
                                 self->mQuickPayButton[i]->setLabelSelected(button_str);
@@ -267,7 +273,7 @@ void LLFloaterPay::processPayPriceReply(LLMessageSystem* msg, void **userdata)
                 }
 
                 // build a string containing the maximum value and calc nerw button width from it.
-                std::string balance_str = "L$";
+                std::string balance_str = gHippoGridManager->getConnectedGrid()->getCurrencySymbol();
                 balance_str += LLResMgr::getInstance()->getMonetaryString( max_pay_amount );
                 const LLFontGL* font = LLResMgr::getInstance()->getRes(LLFONT_SANSSERIF);
                 S32 new_button_width = font->getWidth( std::string(balance_str));
@@ -329,7 +335,9 @@ void LLFloaterPay::payViaObject(money_callback callback, const LLUUID& object_id
         LLViewerObject* object = gObjectList.findObject(object_id);
         if (!object) return;
         
-        LLFloaterPay *floater = new LLFloaterPay("Give L$", callback, object_id, TRUE);
+        LLFloaterPay *floater = new LLFloaterPay(
+                "Give " + gHippoGridManager->getConnectedGrid()->getCurrencySymbol(),
+                callback, object_id, TRUE);
         if (!floater) return;
 
         LLSelectNode* node = floater->mObjectSelection->getFirstRootNode();
@@ -362,7 +370,9 @@ void LLFloaterPay::payDirectly(money_callback callback,
                                                            const LLUUID& target_id,
                                                            BOOL is_group)
 {
-        LLFloaterPay *floater = new LLFloaterPay("Give L$", callback, target_id, FALSE);
+        LLFloaterPay *floater = new LLFloaterPay(
+                "Give " + gHippoGridManager->getConnectedGrid()->getCurrencySymbol(),
+                callback, target_id, FALSE);
         if (!floater) return;
 
         floater->childSetVisible("amount", TRUE);
diff --git a/linden/indra/newview/llhoverview.cpp b/linden/indra/newview/llhoverview.cpp
index 44ef594..5d59818 100644
--- a/linden/indra/newview/llhoverview.cpp
+++ b/linden/indra/newview/llhoverview.cpp
@@ -72,6 +72,8 @@
 #include "llhudmanager.h" // For testing effects
 #include "llhudeffect.h"
 
+#include "hippoGridManager.h"
+
 //
 // Constants
 //
@@ -387,7 +389,7 @@ void LLHoverView::updateText()
 
                                         if (object->flagTakesMoney() || (parent && parent->flagTakesMoney()) )
                                         {
-                                                line.append(LLTrans::getString("TooltipFlagL$") + " ");
+                                                line.append(gHippoGridManager->getConnectedGrid()->getCurrencySymbol() + " ");
                                                 suppressObjectHoverDisplay = FALSE;             //  Show tip
                                         }
 
@@ -433,6 +435,7 @@ void LLHoverView::updateText()
                                         else if (for_sale)
                                         {
                                                 LLStringUtil::format_map_t args;
+                                                args["[CURRENCY]"] = gHippoGridManager->getConnectedGrid()->getCurrencySymbol();
                                                 args["[AMOUNT]"] = llformat("%d", nodep->mSaleInfo.getSalePrice());
                                                 line.append(LLTrans::getString("TooltipForSaleL$", args));
                                                 suppressObjectHoverDisplay = FALSE;             //  Show tip
@@ -614,6 +617,7 @@ void LLHoverView::updateText()
                 if (hover_parcel && hover_parcel->getParcelFlag(PF_FOR_SALE))
                 {
                         LLStringUtil::format_map_t args;
+                        args["[CURRENCY]"] = gHippoGridManager->getConnectedGrid()->getCurrencySymbol();
                         args["[AMOUNT]"] = llformat("%d", hover_parcel->getSalePrice());
                         line = LLTrans::getString("TooltipForSaleL$", args);
                         mText.push_back(line);
diff --git a/linden/indra/newview/llnotify.cpp b/linden/indra/newview/llnotify.cpp
index f8c3b30..a436d2d 100644
--- a/linden/indra/newview/llnotify.cpp
+++ b/linden/indra/newview/llnotify.cpp
@@ -56,6 +56,8 @@
 #include "lluictrlfactory.h"
 #include "llversionviewer.h"
 
+#include "hippoGridManager.h"
+
 // [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-10 (RLVa-1.0.0e) | Added: RLVa-0.2.0b
 #include "rlvhandler.h"
 // [/RLVa:KB]
@@ -552,6 +554,10 @@ void LLNotifyBox::format(std::string& msg, const LLStringUtil::format_map_t& arg
         // targs["[SECOND_LIFE]"] = LLNotifications::instance().getGlobalString("SECOND_LIFE");
         // targs["[VIEWER_NAME]"] = LLNotifications::instance().getGlobalString("VIEWER_NAME");
 
+        //targs["[GRID_NAME]"] = gHippoGridManager->getConnectedGrid()->getGridName();
+        //targs["[GRID_SITE]"] = gHippoGridManager->getConnectedGrid()->getWebSite();
+        //targs["[CURRENCY]"] = gHippoGridManager->getConnectedGrid()->getCurrencySymbol();
+
         LLStringUtil::format(msg, targs);
 }
 
diff --git a/linden/indra/newview/llpanelaudioprefs.cpp b/linden/indra/newview/llpanelaudioprefs.cpp
index 86ece1d..7ad8712 100644
--- a/linden/indra/newview/llpanelaudioprefs.cpp
+++ b/linden/indra/newview/llpanelaudioprefs.cpp
@@ -62,6 +62,8 @@
 #include "llviewerwindow.h"
 #include "llviewercontrol.h"
 
+#include "hippoGridManager.h"
+
 //
 // Static functions
 //
@@ -88,6 +90,8 @@ LLPanelAudioPrefs::~LLPanelAudioPrefs()
 BOOL LLPanelAudioPrefs::postBuild()
 {
         refreshValues(); // initialize member data from saved settings
+        childSetLabelArg("L$ Change Threshold", "[CURRENCY]", gHippoGridManager->getConnectedGrid()->getCurrencySymbol());
+
         return TRUE;
 }
 
diff --git a/linden/indra/newview/llpanelclassified.cpp b/linden/indra/newview/llpanelclassified.cpp
index 4428133..c6f9b0c 100644
--- a/linden/indra/newview/llpanelclassified.cpp
+++ b/linden/indra/newview/llpanelclassified.cpp
@@ -71,6 +71,8 @@
 #include "llviewerwindow.h"     // for window width, height
 #include "llappviewer.h"        // abortQuit()
 
+#include "hippoGridManager.h"
+
 const S32 MINIMUM_PRICE_FOR_LISTING = 50;       // L$
 const S32 MATURE_UNDEFINED = -1;
 const S32 MATURE_CONTENT = 1;
@@ -677,6 +679,7 @@ void LLPanelClassified::processClassifiedInfoReply(LLMessageSystem *msg, void **
                 std::string datestr = llformat("%02d/%02d/%d", now->tm_mon+1, now->tm_mday, now->tm_year+1900);
                 LLStringUtil::format_map_t string_args;
                 string_args["[DATE]"] = datestr;
+                string_args["[CURRENCY]"] = gHippoGridManager->getConnectedGrid()->getCurrencySymbol();
                 string_args["[AMT]"] = llformat("%d", price_for_listing);
                 self->childSetText("classified_info_text", self->getString("ad_placed_paid", string_args));
 
@@ -873,6 +876,7 @@ void LLPanelClassified::callbackGotPriceForListing(S32 option, std::string text,
                 LLSD args;
                 std::string price_text = llformat("%d", MINIMUM_PRICE_FOR_LISTING);
                 args["MIN_PRICE"] = price_text;
+                args["[CURRENCY]"] = gHippoGridManager->getConnectedGrid()->getCurrencySymbol();
                         
                 LLNotifications::instance().add("MinClassifiedPrice", args);
                 return;
@@ -884,6 +888,7 @@ void LLPanelClassified::callbackGotPriceForListing(S32 option, std::string text,
 
         LLSD args;
         args["AMOUNT"] = llformat("%d", price_for_listing);
+        args["CURRENCY"] = gHippoGridManager->getConnectedGrid()->getCurrencySymbol();
         LLNotifications::instance().add("PublishClassified", args, LLSD(), 
                                                                         boost::bind(&LLPanelClassified::confirmPublish, self, _1, _2));
 }
diff --git a/linden/indra/newview/llpaneldirland.cpp b/linden/indra/newview/llpaneldirland.cpp
index 8f4aa9f..c702931 100644
--- a/linden/indra/newview/llpaneldirland.cpp
+++ b/linden/indra/newview/llpaneldirland.cpp
@@ -52,6 +52,8 @@
 #include "llviewercontrol.h"
 #include "llviewermessage.h"
 #include "llnotify.h"
+#include "hippoGridManager.h"
+
 //-----------------------------------------------------------------------------
 // Constants
 //-----------------------------------------------------------------------------
@@ -99,6 +101,10 @@ BOOL LLPanelDirLand::postBuild()
         childSetAction("Search", onClickSearchCore, this);
         setDefaultBtn("Search");
 
+        childSetTextArg("land", "[CURRENCY]", gHippoGridManager->getConnectedGrid()->getCurrencySymbol());
+        childSetTextArg("pricecheck_symbol", "[CURRENCY]", gHippoGridManager->getConnectedGrid()->getCurrencySymbol());
+        childSetLabelArg("pricecheck", "[CURRENCY]", gHippoGridManager->getConnectedGrid()->getCurrencySymbol());
+
         mCurrentSortColumn = "per_meter";
 
         LLScrollListCtrl* results = getChild<LLScrollListCtrl>("results");
@@ -106,6 +112,16 @@ BOOL LLPanelDirLand::postBuild()
         {
                 results->setSortChangedCallback(onClickSort);
                 results->sortByColumn(mCurrentSortColumn,mCurrentSortAscending);
+
+                LLStringUtil::format_map_t args;
+                args["[CURRENCY]"] = gHippoGridManager->getConnectedGrid()->getCurrencySymbol();
+                int n = results->getNumColumns();
+                for (int i=0; i<n; i++) {
+                        LLScrollListColumn *col = results->getColumn(i);
+                        std::string label = col->mLabel;
+                        LLStringUtil::format(label, args);
+                        results->setColumnLabel(col->mName, label);
+                }
         }
 
         return TRUE;
diff --git a/linden/indra/newview/llpanelgroupgeneral.cpp b/linden/indra/newview/llpanelgroupgeneral.cpp
index cbf4a87..8553291 100644
--- a/linden/indra/newview/llpanelgroupgeneral.cpp
+++ b/linden/indra/newview/llpanelgroupgeneral.cpp
@@ -34,6 +34,8 @@
 
 #include "llpanelgroupgeneral.h"
 
+#include "hippoGridManager.h"
+
 #include "lluictrlfactory.h"
 #include "llagent.h"
 #include "roles_constants.h"
@@ -185,6 +187,7 @@ BOOL LLPanelGroupGeneral::postBuild()
         mCtrlEnrollmentFee = getChild<LLCheckBoxCtrl>("check_enrollment_fee", recurse);
         if (mCtrlEnrollmentFee)
         {
+                mCtrlEnrollmentFee->setLabelArg("[CURRENCY]", gHippoGridManager->getConnectedGrid()->getCurrencySymbol());
                 mCtrlEnrollmentFee->setCommitCallback(onCommitEnrollment);
                 mCtrlEnrollmentFee->setCallbackUserData(this);
         }
@@ -235,6 +238,9 @@ BOOL LLPanelGroupGeneral::postBuild()
                 mComboActiveTitle->resetDirty();
         }
 
+        LLStringUtil::format_map_t args;
+        args["[GROUPCREATEFEE]"] = gHippoGridManager->getConnectedGrid()->getGroupCreationFee();
+        mConfirmGroupCreateStr = getString("confirm_group_create_str", args);
         mIncompleteMemberDataStr = getString("incomplete_member_data_str");
         mConfirmGroupCreateStr = getString("confirm_group_create_str");
 
@@ -351,6 +357,7 @@ void LLPanelGroupGeneral::onClickJoin(void *userdata)
                 S32 cost = gdatap->mMembershipFee;
                 LLSD args;
                 args["COST"] = llformat("%d", cost);
+                args["CURRENCY"] = gHippoGridManager->getConnectedGrid()->getCurrencySymbol();
                 LLSD payload;
                 payload["group_id"] = self->mGroupID;
 
@@ -730,7 +737,9 @@ void LLPanelGroupGeneral::update(LLGroupChange gc)
 
                 if ( visible )
                 {
-                        fee_buff = llformat( "Join (L$%d)", gdatap->mMembershipFee);
+                        fee_buff = llformat( "Join (%s%d)",
+                                gHippoGridManager->getConnectedGrid()->getCurrencySymbol().c_str(),
+                                gdatap->mMembershipFee);
                         mBtnJoinGroup->setLabelSelected(fee_buff);
                         mBtnJoinGroup->setLabelUnselected(fee_buff);
                 }
diff --git a/linden/indra/newview/llpanelgrouplandmoney.cpp b/linden/indra/newview/llpanelgrouplandmoney.cpp
index f69ea9f..bded59c 100644
--- a/linden/indra/newview/llpanelgrouplandmoney.cpp
+++ b/linden/indra/newview/llpanelgrouplandmoney.cpp
@@ -55,6 +55,8 @@
 #include "llfloaterworldmap.h"
 #include "llviewermessage.h"
 
+#include "hippoGridManager.h"
+
 ////////////////////////////////////////////////////////////////////////////
 
 class LLGroupMoneyTabEventHandler
@@ -528,6 +530,9 @@ void LLPanelGroupLandMoney::activate()
                         mImplementationp->mBeenActivated = true;
                 }
 
+                setLabelArg("[CURRENCY]", gHippoGridManager->getConnectedGrid()->getCurrencySymbol());
+                childSetTextArg("group_money_heading", "[CURRENCY]", gHippoGridManager->getConnectedGrid()->getCurrencySymbol());
+
                 //fill in the max contribution
 
                 //This calculation is unfortunately based on
@@ -779,7 +784,9 @@ void LLPanelGroupLandMoney::processPlacesReply(LLMessageSystem* msg, void**)
         LLPanelGroupLandMoney* selfp = sGroupIDs.getIfThere(group_id);
         if(!selfp)
         {
-                llinfos << "Group Panel Land L$ " << group_id << " no longer in existence."
+                llinfos << "Group Panel Land "
+                                << gHippoGridManager->getConnectedGrid()->getCurrencySymbol()
+                                << ' ' << group_id << " no longer in existence."
                                 << llendl;
                 return;
         }
@@ -1116,7 +1123,9 @@ void LLPanelGroupLandMoney::processGroupAccountDetailsReply(LLMessageSystem* msg
         msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id );
         if (gAgent.getID() != agent_id)
         {
-                llwarns << "Got group L$ history reply for another agent!" << llendl;
+                llwarns << "Got group "
+                        << gHippoGridManager->getConnectedGrid()->getCurrencySymbol()
+                        << " history reply for another agent!" << llendl;
                 return;
         }
 
@@ -1287,7 +1296,9 @@ void LLPanelGroupLandMoney::processGroupAccountTransactionsReply(LLMessageSystem
         msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id );
         if (gAgent.getID() != agent_id)
         {
-                llwarns << "Got group L$ history reply for another agent!" << llendl;
+                llwarns << "Got group "
+                        << gHippoGridManager->getConnectedGrid()->getCurrencySymbol()
+                        << " history reply for another agent!" << llendl;
                 return;
         }
 
@@ -1428,7 +1439,9 @@ void LLGroupMoneyPlanningTabEventHandler::processReply(LLMessageSystem* msg,
                 text.append("The next stipend day is ");
                 text.append(next_stipend_date);
                 text.append("\n\n");
-                text.append(llformat("%-24sL$%6d\n", "Balance", balance ));
+                text.append(llformat("%-24s%s%6d\n", "Balance",
+                        gHippoGridManager->getConnectedGrid()->getCurrencySymbol().c_str(),
+                        balance));
                 text.append(1, '\n');
         }
 
@@ -1458,7 +1471,9 @@ void LLPanelGroupLandMoney::processGroupAccountSummaryReply(LLMessageSystem* msg
         msg->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id );
         if (gAgent.getID() != agent_id)
         {
-                llwarns << "Got group L$ history reply for another agent!" << llendl;
+                llwarns << "Got group "
+                        << gHippoGridManager->getConnectedGrid()->getCurrencySymbol()
+                        << " history reply for another agent!" << llendl;
                 return;
         }
 
@@ -1470,7 +1485,9 @@ void LLPanelGroupLandMoney::processGroupAccountSummaryReply(LLMessageSystem* msg
         self = LLGroupMoneyTabEventHandler::sInstanceIDs.getIfThere(request_id);
         if (!self)
         {
-                llwarns << "GroupAccountSummary recieved for non-existent group L$ planning tab." << llendl;
+                llwarns << "GroupAccountSummary recieved for non-existent group "
+                        << gHippoGridManager->getConnectedGrid()->getCurrencySymbol()
+                        << " planning tab." << llendl;
                 return;
         }
 
diff --git a/linden/indra/newview/llpanelinventory.cpp b/linden/indra/newview/llpanelinventory.cpp
index 2b78281..f882362 100644
--- a/linden/indra/newview/llpanelinventory.cpp
+++ b/linden/indra/newview/llpanelinventory.cpp
@@ -86,6 +86,8 @@
 #include "llvoavatar.h"
 // [/RLVa:KB]
 
+#include "hippoGridManager.h"
+
 ///----------------------------------------------------------------------------
 /// Local function declarations, constants, enums, and typedefs
 ///----------------------------------------------------------------------------
@@ -238,6 +240,7 @@ void LLTaskInvFVBridge::buyItem()
         {
         LLSD args;
         args["PRICE"] = llformat("%d",sale_info.getSalePrice());
+        args["CURRENCY"] = gHippoGridManager->getConnectedGrid()->getCurrencySymbol();
         args["OWNER"] = owner_name;
         if (sale_info.getSaleType() != LLSaleInfo::FS_CONTENTS)
         {
@@ -724,7 +727,7 @@ void LLTaskInvFVBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
                 else
                 {
                         std::ostringstream info;
-                        info << "Buy for L$" << price;
+                        info << "Buy for " << gHippoGridManager->getConnectedGrid()->getCurrencySymbol() << price;
                         label.assign(info.str());
                 }
 
@@ -1102,7 +1105,7 @@ void LLTaskSoundBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
                 else
                 {
                         std::ostringstream info;
-                        info << "Buy for L$" << price;
+                        info << "Buy for " << gHippoGridManager->getConnectedGrid()->getCurrencySymbol() << price;
                         label.assign(info.str());
                 }
 
diff --git a/linden/indra/newview/llpanelland.cpp b/linden/indra/newview/llpanelland.cpp
index 27bfaea..7c9faaf 100644
--- a/linden/indra/newview/llpanelland.cpp
+++ b/linden/indra/newview/llpanelland.cpp
@@ -49,6 +49,8 @@
 
 #include "lluictrlfactory.h"
 
+#include "hippoGridManager.h"
+
 LLPanelLandSelectObserver* LLPanelLandInfo::sObserver = NULL;
 LLPanelLandInfo* LLPanelLandInfo::sInstance = NULL;
 
@@ -213,6 +215,7 @@ void LLPanelLandInfo::refresh()
                                                                    &dwell);
                 if(is_public || (is_for_sale && LLViewerParcelMgr::getInstance()->getParcelSelection()->getWholeParcelSelected()))
                 {
+                        childSetTextArg("label_area_price","[CURRENCY]", gHippoGridManager->getConnectedGrid()->getCurrencySymbol());
                         childSetTextArg("label_area_price","[PRICE]", llformat("%d",claim_price));
                         childSetTextArg("label_area_price","[AREA]", llformat("%d",area));
                         childSetVisible("label_area_price",true);
diff --git a/linden/indra/newview/llpanelmsgs.cpp b/linden/indra/newview/llpanelmsgs.cpp
index 42af550..3ea7aa5 100644
--- a/linden/indra/newview/llpanelmsgs.cpp
+++ b/linden/indra/newview/llpanelmsgs.cpp
@@ -40,6 +40,8 @@
 #include "lluictrlfactory.h"
 #include "llfirstuse.h"
 
+#include "hippoGridManager.h"
+
 //-----------------------------------------------------------------------------
 LLPanelMsgs::LLPanelMsgs() : 
         LLPanel("Messages Panel")
@@ -66,6 +68,7 @@ BOOL LLPanelMsgs::postBuild()
         childSetValue("show_in_inventory", gSavedSettings.getBOOL("ShowInInventory"));
 
         childSetValue("notify_money_change_checkbox", gSavedSettings.getBOOL("NotifyMoneyChange"));
+        childSetLabelArg("notify_money_change_checkbox", "[CURRENCY]", gHippoGridManager->getConnectedGrid()->getCurrencySymbol());
 
         return TRUE;
 }
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());
diff --git a/linden/indra/newview/llpanelplace.cpp b/linden/indra/newview/llpanelplace.cpp
index 7ca3622..300cd79 100644
--- a/linden/indra/newview/llpanelplace.cpp
+++ b/linden/indra/newview/llpanelplace.cpp
@@ -58,6 +58,8 @@
 #include "llweb.h"
 #include "llsdutil.h"
 
+#include "hippoGridManager.h"
+
 //static
 std::list<LLPanelPlace*> LLPanelPlace::sAllPanels;
 
@@ -311,6 +313,7 @@ void LLPanelPlace::processParcelInfoReply(LLMessageSystem *msg, void **)
                 if (flags & DFQ_FOR_SALE)
                 {
                         LLUIString forsale = self->getString("forsale_text");
+                        forsale.setArg("[CURRENCY]", gHippoGridManager->getConnectedGrid()->getCurrencySymbol());
                         forsale.setArg("[PRICE]", llformat("%d", sale_price));
                         info_text += forsale;
                 }
diff --git a/linden/indra/newview/llstatusbar.cpp b/linden/indra/newview/llstatusbar.cpp
index b4076b9..5434c20 100644
--- a/linden/indra/newview/llstatusbar.cpp
+++ b/linden/indra/newview/llstatusbar.cpp
@@ -87,6 +87,8 @@
 #include <iomanip>
 
 
+#include "hippoGridManager.h"
+
 //
 // Globals
 //
@@ -669,10 +671,8 @@ void LLStatusBar::creditBalance(S32 credit)
 
 void LLStatusBar::setBalance(S32 balance)
 {
-        std::string money_str = LLResMgr::getInstance()->getMonetaryString( balance );
-        std::string balance_str = "L$";
-        balance_str += money_str;
-        mTextBalance->setText( balance_str );
+        mTextBalance->setText(gHippoGridManager->getConnectedGrid()->getCurrencySymbol().c_str() +
+                LLResMgr::getInstance()->getMonetaryString(balance));
 
         if (mBalance && (fabs((F32)(mBalance - balance)) > gSavedSettings.getF32("UISndMoneyChangeThreshold")))
         {
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 9d06853..770384a 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -225,6 +225,7 @@
 #include "jcfloater_animation_list.h"
 #include "llfloaterassetbrowser.h"
 
+#include "hippoGridManager.h"
 #include "hippoLimits.h"
 
 using namespace LLVOAvatarDefines;
@@ -665,12 +666,14 @@ void init_menus()
         LLViewerLogin::getInstance()->isInProductionGrid());
 
         // Assume L$10 for now, the server will tell us the real cost at login
-        const std::string upload_cost("10");
-        gMenuHolder->childSetLabelArg("Upload Image", "[COST]", upload_cost);
-        gMenuHolder->childSetLabelArg("Upload Sound", "[COST]", upload_cost);
-        gMenuHolder->childSetLabelArg("Upload Animation", "[COST]", upload_cost);
-        gMenuHolder->childSetLabelArg("Bulk Upload", "[COST]", upload_cost);
-        gMenuHolder->childSetLabelArg("ImportUpload", "[COST]", upload_cost);
+        std::string fee = gHippoGridManager->getConnectedGrid()->getCurrencySymbol() + "10";
+        gMenuHolder->childSetLabelArg("Upload Image", "[UPLOADFEE]", fee);
+        gMenuHolder->childSetLabelArg("Upload Sound", "[UPLOADFEE]", fee);
+        gMenuHolder->childSetLabelArg("Upload Animation", "[UPLOADFEE]", fee);
+        gMenuHolder->childSetLabelArg("Bulk Upload", "[UPLOADFEE]", fee);
+        gMenuHolder->childSetLabelArg("ImportUpload", "[UPLOADFEE]", fee);
+        gMenuHolder->childSetLabelArg("Buy and Sell L$...", "[CURRENCY]",
+                gHippoGridManager->getConnectedGrid()->getCurrencySymbol());
 
         gAFKMenu = gMenuBarView->getChild<LLMenuItemCallGL>("Set Away", TRUE);
         gBusyMenu = gMenuBarView->getChild<LLMenuItemCallGL>("Set Busy", TRUE);
diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp
index 5609edf..7a52b84 100644
--- a/linden/indra/newview/llviewermessage.cpp
+++ b/linden/indra/newview/llviewermessage.cpp
@@ -138,11 +138,12 @@
 #include "llviewerdisplay.h"
 #include "llkeythrottle.h"
 
-#include "hippoLimits.h"
-
 #include <boost/tokenizer.hpp>
 #include <boost/regex.hpp> // Boost Reg Expresions
 
+#include "hippoGridManager.h"
+#include "hippoLimits.h"
+
 #if LL_WINDOWS // For Windows specific error handler
 #include "llwindebug.h" // For the invalid message handler
 #endif
@@ -682,6 +683,7 @@ bool join_group_response(const LLSD& notification, const LLSD& response)
                         delete_context_data = FALSE;
                         LLSD args;
                         args["COST"] = llformat("%d", fee);
+                        args["CURRENCY"] = gHippoGridManager->getConnectedGrid()->getCurrencySymbol();
                         // Set the fee for next time to 0, so that we don't keep
                         // asking about a fee.
                         LLSD next_payload = notification["payload"];
@@ -4632,7 +4634,8 @@ void process_money_balance_reply( LLMessageSystem* msg, void** )
         msg->getS32("MoneyData", "SquareMetersCredit", credit);
         msg->getS32("MoneyData", "SquareMetersCommitted", committed);
         msg->getStringFast(_PREHASH_MoneyData, _PREHASH_Description, desc);
-        LL_INFOS("Messaging") << "L$, credit, committed: " << balance << " " << credit << " "
+        LL_INFOS("Messaging") << gHippoGridManager->getConnectedGrid()->getCurrencySymbol()
+                        << ", credit, committed: " << balance << " " << credit << " "
                         << committed << LL_ENDL;
 
         if (gStatusBar)
@@ -5030,15 +5033,21 @@ void process_economy_data(LLMessageSystem *msg, void** /*user_data*/)
 
         S32 upload_cost = LLGlobalEconomy::Singleton::getInstance()->getPriceUpload();
 
-        LL_INFOS_ONCE("Messaging") << "EconomyData message arrived; upload cost is L$" << upload_cost << LL_ENDL;
+        LL_INFOS_ONCE("Messaging") << "EconomyData message arrived; upload cost is " 
+                                << gHippoGridManager->getConnectedGrid()->getCurrencySymbol() 
+                                << upload_cost << LL_ENDL;
 
         LLFloaterImagePreview::setUploadAmount(upload_cost);
         LLFloaterAnimPreview::setUploadAmount(upload_cost);
 
-        gMenuHolder->childSetLabelArg("Upload Image", "[COST]", llformat("%d", upload_cost));
-        gMenuHolder->childSetLabelArg("Upload Sound", "[COST]", llformat("%d", upload_cost));
-        gMenuHolder->childSetLabelArg("Upload Animation", "[COST]", llformat("%d", upload_cost));
-        gMenuHolder->childSetLabelArg("Bulk Upload", "[COST]", llformat("%d", upload_cost));
+        std::string fee = gHippoGridManager->getConnectedGrid()->getUploadFee();
+        gMenuHolder->childSetLabelArg("Upload Image", "[UPLOADFEE]", fee);
+        gMenuHolder->childSetLabelArg("Upload Sound", "[UPLOADFEE]", fee);
+        gMenuHolder->childSetLabelArg("Upload Animation", "[UPLOADFEE]", fee);
+        gMenuHolder->childSetLabelArg("Bulk Upload", "[UPLOADFEE]", fee);
+        gMenuHolder->childSetLabelArg("ImportUpload", "[UPLOADFEE]", fee);
+        gMenuHolder->childSetLabelArg("Buy and Sell L$...", "[CURRENCY]",
+                gHippoGridManager->getConnectedGrid()->getCurrencySymbol());
 }
 
 void notify_cautioned_script_question(const LLSD& notification, const LLSD& response, S32 orig_questions, BOOL granted)
@@ -5112,7 +5121,9 @@ void notify_cautioned_script_question(const LLSD& notification, const LLSD& resp
                                         perms.append(", ");
                                 }
 
-                                perms.append(LLFloaterChat::getInstance()->getString(SCRIPT_QUESTIONS[i]));
+                                LLStringUtil::format_map_t args;
+                                args["[CURRENCY]"] = gHippoGridManager->getConnectedGrid()->getCurrencySymbol();
+                                perms.append(LLFloaterChat::getInstance()->getString(SCRIPT_QUESTIONS[i], args));
                         }
                 }
 
@@ -5273,8 +5284,11 @@ void process_script_question(LLMessageSystem *msg, void **user_data)
                 {
                         if (questions & LSCRIPTRunTimePermissionBits[i])
                         {
+                                LLStringUtil::format_map_t args;
+                                args["[CURRENCY]"] = gHippoGridManager->getConnectedGrid()->getCurrencySymbol();
+                                
                                 count++;
-                                script_question += "    " + LLFloaterChat::getInstance()->getString(SCRIPT_QUESTIONS[i]) + "\n";
+                                script_question += "    " + LLFloaterChat::getInstance()->getString(SCRIPT_QUESTIONS[i], args) + "\n";
 
                                 // check whether permission question should cause special caution dialog
                                 caution |= (SCRIPT_QUESTION_IS_CAUTION[i]);
diff --git a/linden/indra/newview/llviewerparcelmgr.cpp b/linden/indra/newview/llviewerparcelmgr.cpp
index b0e1e78..cb8ae66 100644
--- a/linden/indra/newview/llviewerparcelmgr.cpp
+++ b/linden/indra/newview/llviewerparcelmgr.cpp
@@ -70,6 +70,8 @@
 #include "roles_constants.h"
 #include "llweb.h"
 
+#include "hippoGridManager.h"
+
 const F32 PARCEL_COLLISION_DRAW_SECS = 1.f;
 
 
@@ -2016,6 +2018,7 @@ void LLViewerParcelMgr::startReleaseLand()
         // Compute claim price
         LLSD args;
         args["AREA"] = llformat("%d",mCurrentParcel->getArea());
+        args["CURRENCY"] = gHippoGridManager->getConnectedGrid()->getCurrencySymbol();
         LLNotifications::instance().add("ReleaseLandWarning", args, LLSD(), releaseAlertCB);
 }
 
diff --git a/linden/indra/newview/llworldmap.cpp b/linden/indra/newview/llworldmap.cpp
index 572f31f..908cd87 100644
--- a/linden/indra/newview/llworldmap.cpp
+++ b/linden/indra/newview/llworldmap.cpp
@@ -47,6 +47,8 @@
 #include "llviewerregion.h"
 #include "llregionflags.h"
 
+#include "hippoGridManager.h"
+
 const F32 REQUEST_ITEMS_TIMER =  10.f * 60.f; // 10 minutes
 
 // For DEV-17507, do lazy image loading in llworldmapview.cpp instead,
@@ -790,7 +792,9 @@ void LLWorldMap::processMapItemReply(LLMessageSystem* msg, void**)
                         case MAP_ITEM_LAND_FOR_SALE: // land for sale
                         case MAP_ITEM_LAND_FOR_SALE_ADULT: // adult land for sale 
                         {
-                                new_item.mToolTip = llformat("%d sq. m. L$%d", new_item.mExtra, new_item.mExtra2);
+                                new_item.mToolTip = llformat("%d sq. m. %s%d", new_item.mExtra,
+                                        gHippoGridManager->getConnectedGrid()->getCurrencySymbol().c_str(),
+                                        new_item.mExtra2);
                                 if (type == MAP_ITEM_LAND_FOR_SALE)
                                 {
                                         LLWorldMap::getInstance()->mLandForSale.push_back(new_item);
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml b/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
index 569e421..80281f6 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_about_land.xml
@@ -118,7 +118,7 @@
                              bottom="-220" drop_shadow_visible="true" enabled="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="16" left="96"
                              mouse_opaque="true" name="For Sale: Price L$[PRICE]." v_pad="0" width="226">
-                                Price: L$[PRICE] (L$[PRICE_PER_SQM]/sq.m.).
+                                Price: [CURRENCY][PRICE] ([CURRENCY][PRICE_PER_SQM]/sq.m.).
                         </text>
                         <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom="-240" drop_shadow_visible="true" enabled="false" follows="left|top"
@@ -624,7 +624,7 @@ Go to World menu > About Land or select another parcel to show its details.
                              width="119" />
                         <check_box bottom="-140" enabled="true" follows="left|top" font="SansSerifSmall"
                              height="16" initial_value="false"
-                             label="Show Place in Search (L$30/week) under" left="14"
+                             label="Show Place in Search ([DIRECTORYFEE]) under" left="14"
                              mouse_opaque="true" name="ShowDirectoryCheck" radio_style="false"
                              tool_tip="Let people see this parcel in search results" width="268" />
                         <string name="search_enabled_tooltip">
@@ -991,7 +991,7 @@ Options:
                                 </combo_item>
                         </combo_box>
                         <spinner bottom_delta="-20" enabled="false" follows="left|top" height="16" increment="1"
-                             initial_val="10" label="Price in L$:" label_width="120" left="28"
+                             initial_val="10" label="Price in [CURRENCY]:" label_width="120" left="28"
                              max_val="500" min_val="1" mouse_opaque="true" name="PriceSpin" width="180" />
                         <spinner bottom_delta="-20" enabled="false" follows="left|top" height="16"
                              increment="0.25" initial_val="1" label="Hours of access:" label_width="120"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_animation_preview.xml b/linden/indra/newview/skins/default/xui/en-us/floater_animation_preview.xml
index 4038f4f..1a7bdb0 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_animation_preview.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_animation_preview.xml
@@ -187,7 +187,7 @@ We recommend BVH files exported from Poser 4.
         </text>
         <button bottom="10" follows="bottom|right" height="20" label="Cancel" name="cancel_btn"
              right="290" width="123" />
-        <button bottom="10" follows="bottom|left" height="20" label="Upload (L$[AMOUNT])"
+        <button bottom="10" follows="bottom|left" height="20" label="Upload ([UPLOADFEE])"
              left_delta="-129" name="ok_btn" width="123" />
         <string name="failed_to_initialize">
                 Failed to initialize motion
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_buy_contents.xml b/linden/indra/newview/skins/default/xui/en-us/floater_buy_contents.xml
index a9acccb..1d49021 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_buy_contents.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_buy_contents.xml
@@ -19,7 +19,7 @@
              bottom_delta="-28" drop_shadow_visible="true" follows="left|right|bottom"
              font="SansSerif" h_pad="0" halign="left" height="24" left="15"
              mouse_opaque="true" name="buy_text" v_pad="0" width="281">
-                Buy for L$[AMOUNT] from [NAME]?
+                Buy for [CURRENCY][AMOUNT] from [NAME]?
         </text>
         <button bottom="-244" follows="right|bottom" font="SansSerif" halign="center"
              height="20" label="Cancel" label_selected="Cancel" left="216"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_buy_currency.xml b/linden/indra/newview/skins/default/xui/en-us/floater_buy_currency.xml
index f592d44..55a088d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_buy_currency.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_buy_currency.xml
@@ -26,19 +26,19 @@
              left="0" name="step_1" width="64" />
         <text bottom_delta="38" follows="top|left" height="16" left="72" name="contacting"
              right="-20" >
-                Contacting LindeX...
+                Contacting money exchange...
         </text>
         <text bottom_delta="0" follows="top|left" height="16" left="72"
              name="buy_action_unknown" right="-20" >
-                Buy L$ on the LindeX currency exchange
+                Buy [CURRENCY] on the currency exchange
         </text>
         <text bottom_delta="0" follows="top|left" height="16" left="72" name="buy_action"
              right="-20" >
-                [NAME] L$ [PRICE]
+                [NAME] [CURRENCY] [PRICE]
         </text>
         <text bottom_delta="-20" follows="top|left" height="16" left="72"
              name="currency_action"  width="40">
-                Buy L$
+                Buy [CURRENCY]
         </text>
         <line_editor bottom_delta="0" follows="top|right" height="16" left_delta="45"
              name="currency_amt" width="80">
@@ -46,7 +46,7 @@
         </line_editor>
         <text bottom_delta="0" follows="top|right" height="16" left_delta="85"
              name="currency_est"  width="180">
-                for approx. US$ [USD]
+                for approx. [REALCURRENCY] [USD]
         </text>
         <text bottom_delta="0" follows="top|right" height="16" left_delta="5"
              name="getting_data" width="180">
@@ -58,7 +58,7 @@
         </text>
         <text bottom_delta="0" follows="top|left" halign="right" height="16" left="80"
              name="balance_amount" width="240">
-                L$ [AMT]
+                [CURRENCY] [AMT]
         </text>
         <text bottom_delta="-20" follows="top|left" height="16" left="80" name="buying_label"
              width="240">
@@ -66,7 +66,7 @@
         </text>
         <text bottom_delta="0" follows="top|left" halign="right" height="16" left="80"
              name="buying_amount" width="240">
-                L$ [AMT]
+                [CURRENCY] [AMT]
         </text>
         <text bottom_delta="-20" follows="top|left" height="16" left="80" name="total_label"
              width="240">
@@ -74,7 +74,7 @@
         </text>
         <text bottom_delta="0" follows="top|left" halign="right" height="16" left="80"
              name="total_amount" width="240">
-                L$ [AMT]
+                [CURRENCY] [AMT]
         </text>
         <text bottom_delta="-48" follows="top|left" height="32" left="72"
              name="purchase_warning_repurchase" right="-20" >
@@ -91,6 +91,6 @@ Increase the amount to buy.
         <button bottom_delta="0" follows="bottom|left" height="20" label="Purchase"
              left_delta="-96" name="buy_btn" width="90" />
         <string name="buy_currency">
-                Buy L$ [LINDENS] for approx. US$ [USD]
+                Buy [CURRENCY] [LINDENS] for approx. [REALCURRENCY] [USD]
         </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_buy_land.xml b/linden/indra/newview/skins/default/xui/en-us/floater_buy_land.xml
index cba79cc..7cd895f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_buy_land.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_buy_land.xml
@@ -159,7 +159,7 @@ This parcel is 512 sq.m. of land.
         </text>
         <text bottom_delta="-25" follows="top|left" height="16" left="72"
              name="currency_action" width="90">
-                Buy additional L$
+                Buy additional [CURRENCY]
         </text>
         <pad height="0" width="8" />
         <line_editor bottom_delta="5" follows="top|right" height="16" left="170" name="currency_amt"
@@ -258,10 +258,10 @@ Try selecting a smaller area.
                 You hold [BUYER] sq.m. of land.
         </string>
         <string name="pay_to_for_land">
-                Pay L$ [AMOUNT] to [SELLER] for this land
+                Pay [CURRENCY] [AMOUNT] to [SELLER] for this land
         </string>
         <string name="buy_for_US">
-                Buy L$ [AMOUNT] for approx. US$ [AMOUNT2],
+                Buy [CURRENCY] [AMOUNT] for approx. US$ [AMOUNT2],
         </string>
         <string name="parcel_meters">
                 This parcel is [AMOUNT] sq.m.
@@ -291,21 +291,21 @@ supports [AMOUNT2] objects
                 The group [GROUP] will need sufficient contributed land use credits to cover this parcel before the purchase will complete.
         </string>
         <string name="have_enough_lindens">
-                You have L$ [AMOUNT], which is enough to buy this land.
+                You have [CURRENCY] [AMOUNT], which is enough to buy this land.
         </string>
         <string name="not_enough_lindens">
-                You have only L$ [AMOUNT], and need L$ [AMOUNT2] more.
+                You have only [CURRENCY] [AMOUNT], and need [CURRENCY] [AMOUNT2] more.
         </string>
         <string name="balance_left">
-                After the purchase, you will have L$ [AMOUNT] left.
+                After the purchase, you will have [CURRENCY] [AMOUNT] left.
         </string>
         <string name="balance_needed">
-                You need to buy at least L$ [AMOUNT] to afford this land.
+                You need to buy at least [CURRENCY] [AMOUNT] to afford this land.
         </string>
         <string name="no_parcel_selected">
                 (no parcel selected)
         </string>
         <string name="buy_currency">
-                Buy L$ [LINDENS] for approx. US$ [USD]
+                Buy [CURRENCY] [LINDENS] for approx. US$ [USD]
         </string>
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_buy_object.xml b/linden/indra/newview/skins/default/xui/en-us/floater_buy_object.xml
index 3d30171..8412388 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_buy_object.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_buy_object.xml
@@ -26,7 +26,7 @@
              bottom_delta="-28" drop_shadow_visible="true" follows="left|right|bottom"
              font="SansSerif" h_pad="0" halign="left" height="24" left="15"
              mouse_opaque="true" name="buy_text" v_pad="0" width="281">
-                Buy for L$[AMOUNT] from [NAME]?
+                Buy for [CURRENCY][AMOUNT] from [NAME]?
         </text>
         <button bottom="-244" follows="right|bottom" font="SansSerif" halign="center"
              height="20" label="Cancel" label_selected="Cancel" left="216"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml b/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
index a21887f..8408833 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_chat_history.xml
@@ -32,7 +32,7 @@
 '[OBJECTNAME]', an object owned by '[OWNERNAME]', located in [REGIONNAME] at [REGIONPOS], has been denied permission to: [PERMISSIONS].
   </string>
   <string name="ScriptTakeMoney">
-      Take Linden dollars (L$) from you
+      Take currency from you
   </string>
   <string name="ActOnControlInputs">
       Act on your control inputs
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_directory.xml b/linden/indra/newview/skins/default/xui/en-us/floater_directory.xml
index 2777d37..99c980b 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_directory.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_directory.xml
@@ -406,7 +406,7 @@
                                 None Found.
                         </string>
                         <string name="land_help_text">
-                                Land can be bought direct for Linden Dollars (L$) or at auction for either L$ or US$.
+                                Land can be bought direct for inworld currency or at auction for either real or inworld currency.
 To buy direct, visit the land and click on the place name in the title bar.
                         </string>
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
@@ -449,8 +449,8 @@ To buy direct, visit the land and click on the place name in the title bar.
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" follows="left|top"
                              bottom="-24" font="SansSerifSmall" halign="left" height="16" left="116" mouse_opaque="true"
                              name="pricecheck_symbol" width="15">
-                                L$
-                        </text>
+        [CURRENCY]
+      </text>
                         <check_box bottom_delta="-18" control_name="FindLandArea" follows="left|top"
                              font="SansSerifSmall" height="16" initial_value="true"
                              label="Area &#8805; " left="56" mouse_opaque="true" name="areacheck"
@@ -476,9 +476,9 @@ To buy direct, visit the land and click on the place name in the title bar.
                                 <column label="" name="type" width="-1" />
                                 <column dynamicwidth="true" label="Name" name="name" />
                                 <column label="Type" name="landtype" width="50" />
-                                <column label="L$ Price" name="price" width="65" />
+                                <column label="[CURRENCY] Price" name="price" width="65" />
                                 <column label="Area" name="area" width="50" />
-                                <column label="L$/m²" name="per_meter" width="65" />
+                                <column label="[CURRENCY]/m²" name="per_meter" width="65" />
                         </scroll_list>
                         <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                              bottom_delta="-20" drop_shadow_visible="true" follows="left|bottom"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_image_preview.xml b/linden/indra/newview/skins/default/xui/en-us/floater_image_preview.xml
index 975f650..32a715e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_image_preview.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_image_preview.xml
@@ -63,6 +63,6 @@ Try saving image as 24 bit Targa (.tga).
              left_delta="0" name="temp_check" width="280" tooltip="Sets the asset to be temporary, meaning its free, but in return, only good for a short time before it ceases to exist." />
         <button bottom="5" follows="bottom|right" height="20" label="Cancel" left="165"
              name="cancel_btn" width="125" />
-        <button bottom="5" follows="bottom|left" height="20" label="Upload (L$[AMOUNT])"
+        <button bottom="5" follows="bottom|left" height="20" label="Upload ([UPLOADFEE])"
              left="15" name="ok_btn" width="125" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_inventory_item_properties.xml b/linden/indra/newview/skins/default/xui/en-us/floater_inventory_item_properties.xml
index ce0679c..5b111eb 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_inventory_item_properties.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_inventory_item_properties.xml
@@ -161,7 +161,7 @@
              bottom="-315" drop_shadow_visible="true" follows="left|top"
              font="SansSerifSmall" h_pad="0" halign="left" height="16" left="42"
              mouse_opaque="true" name="TextPrice" v_pad="0" width="56">
-                Price:  L$
+                Price: [CURRENCY]
         </text>
         <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-315"
              enabled="true" follows="left|top|right" font="SansSerifSmall" height="16"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_name_description.xml b/linden/indra/newview/skins/default/xui/en-us/floater_name_description.xml
index 62c8335..a91d9e2 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_name_description.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_name_description.xml
@@ -14,6 +14,6 @@
              width="280" />
         <button bottom="10" follows="bottom|right" height="20" label="Cancel" left="182"
              name="cancel_btn" width="64" />
-        <button bottom="10" follows="bottom|left" height="20" label="Upload (L$[AMOUNT])" left="31"
+        <button bottom="10" follows="bottom|left" height="20" label="Upload ([UPLOADFEE])" left="31"
              name="ok_btn" width="110" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_pay.xml b/linden/indra/newview/skins/default/xui/en-us/floater_pay.xml
index 9caf96e..be53b41 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_pay.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_pay.xml
@@ -12,19 +12,19 @@
                 Fast Pay:
         </text>
 
-        <button name="fastpay 1" label="L$1"
+        <button name="fastpay 1" label="[CURRENCY]1"
                 bottom_delta="0" left="95" height="20" width="75"
                 font="SansSerif" halign="center" scale_image="true" />
 
-        <button name="fastpay 5" label="L$5"
+        <button name="fastpay 5" label="[CURRENCY]5"
                 bottom_delta="0" left_delta="85" height="20" width="75"
                 font="SansSerif" halign="center" scale_image="true" />
 
-        <button name="fastpay 10" label="L$10"
+        <button name="fastpay 10" label="[CURRENCY]10"
                 bottom_delta="-25" left="95" height="20" width="75"
                 font="SansSerif" halign="center" scale_image="true" />
 
-        <button name="fastpay 20" label="L$20"
+        <button name="fastpay 20" label="[CURRENCY]20"
                 bottom_delta="0" left_delta="85" height="20" width="75"
                 font="SansSerif" halign="center" scale_image="true" />
 
@@ -55,7 +55,7 @@
         <text name="currency text"
               bottom_delta="0" left_delta="67" height="18" width="15"
               follows="left|top" font="SansSerif">
-          L$
+          [CURRENCY]
         </text>
 
         <line_editor name="amount" max_length="9"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_pay_object.xml b/linden/indra/newview/skins/default/xui/en-us/floater_pay_object.xml
index e66d8d5..9e9c1a8 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_pay_object.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_pay_object.xml
@@ -27,19 +27,19 @@
           Fast Pay:
         </text>
 
-        <button name="fastpay 1" label="L$1"
+        <button name="fastpay 1" label="[CURRENCY]1"
                 bottom_delta="0" left="95" height="20" width="75"
                 font="SansSerif" halign="center" scale_image="true" />
 
-        <button name="fastpay 5" label="L$5"
+        <button name="fastpay 5" label="[CURRENCY]5"
                 bottom_delta="0" left_delta="85" height="20" width="75"
                 font="SansSerif" halign="center" scale_image="true" />
 
-        <button name="fastpay 10" label="L$10"
+        <button name="fastpay 10" label="[CURRENCY]10"
                 bottom_delta="-25" left="95" height="20" width="75"
                 font="SansSerif" halign="center" scale_image="true" />
 
-        <button name="fastpay 20" label="L$20"
+        <button name="fastpay 20" label="[CURRENCY]20"
                 bottom_delta="0" left_delta="85" height="20" width="75"
                 font="SansSerif" halign="center" scale_image="true" />
 
@@ -58,7 +58,7 @@
         <text name="currency text" type="string" length="1"
               bottom_delta="0" left_delta="62" height="18" width="15"
               follows="left|top" font="SansSerif"  halign="left">
-                L$
+                [CURRENCY]
         </text>
 
         <line_editor name="amount" max_length="9"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_postcard.xml b/linden/indra/newview/skins/default/xui/en-us/floater_postcard.xml
index 9cf7b5f..97cbeb8 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_postcard.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_postcard.xml
@@ -36,14 +36,13 @@
         </text_editor>
         <text bottom_delta="-37" follows="left|bottom" font="SansSerifSmall" left="12"
              name="fine_print">
-                If your recipient joins SL, you&apos;ll get a referral bonus.
         </text>
         <button bottom_delta="-32" follows="right|bottom" height="20" label="Cancel"
              name="cancel_btn" right="-10" width="100" />
         <button bottom_delta="0" follows="right|bottom" height="20" label="Send"
              left_delta="-106" name="send_btn" width="100" />
         <string name="default_subject">
-                Postcard from a virtual world.
+                Postcard from [GRID_NAME].
         </string>
         <string name="default_message">
                 Check this out!
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_sell_land.xml b/linden/indra/newview/skins/default/xui/en-us/floater_sell_land.xml
index bb2c3e5..d91b5ff 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_sell_land.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_sell_land.xml
@@ -34,12 +34,12 @@
                 Choose an appropriate price for this land.
         </text>
         <text height="16" left="72" name="price_ld" width="20">
-                L$
+                [CURRENCY]
         </text>
         <line_editor bottom_delta="0" follows="top|left" height="16" increment="1" initial_val="0"
              left_delta="20" max_val="999999999" min_val="0" name="price" width="100" />
         <text bottom_delta="0" height="16" left_delta="110" name="price_per_m" width="200">
-                (L$[PER_METER] per square meter)
+                ([CURRENCY][PER_METER] per square meter)
         </text>
         <icon follows="top|left" height="64" image_name="badge_note.j2c" left="0"
              name="step_sell_to" width="64" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml b/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml
index 35a8ec1..3b039de 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_snapshot.xml
@@ -16,7 +16,7 @@
                         Send via email
                 </radio_item>
                 <radio_item bottom="-38" height="16" name="texture">
-      Save to your inventory (L$[AMOUNT])
+      Save to your inventory ([UPLOADFEE])
     </radio_item>
                 <radio_item bottom="-57" height="16" name="local">
                         Save to your hard drive
@@ -30,7 +30,7 @@
              name="new_snapshot_btn" width="195" />
         <button bottom_delta="-22" follows="left|top" height="20" label="Send" left="10"
              name="send_btn" width="105" />
-        <button bottom_delta="0" follows="left|top" height="20" label="Save (L$[AMOUNT])" left="10"
+        <button bottom_delta="0" follows="left|top" height="20" label="Save ([UPLOADFEE])" left="10"
              name="upload_btn" width="105" />
   <flyout_button bottom_delta="0" follows="left|top" height="20" label="Save" left="10"
        list_position="below" mouse_opaque="true" name="save_btn" tool_tip="Save image to a file"
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_sound_preview.xml b/linden/indra/newview/skins/default/xui/en-us/floater_sound_preview.xml
index de72f7e..3738077 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_sound_preview.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_sound_preview.xml
@@ -24,6 +24,6 @@
              height="20" label="Cancel" label_selected="Cancel" left="200"
              mouse_opaque="true" name="cancel_btn" width="90" />
         <button bottom="-180" follows="left|bottom" font="SansSerif" halign="center"
-             height="20" label="Upload (L$[AMOUNT])"
+             height="20" label="Upload ([UPLOADFEE])"
              left_delta="-135" mouse_opaque="true" name="ok_btn" width="130" />
 </floater>
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
index 52275ea..fb77cff 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
@@ -457,7 +457,7 @@
                              bottom_delta="0" drop_shadow_visible="true" follows="left|top"
                              font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="90"
                              mouse_opaque="true" name="Cost" v_pad="0" width="78">
-                                Price:  L$
+                                Price: [CURRENCY]
                         </text>
                         <line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
                              follows="left|top|right" font="SansSerifSmall" height="16" left_delta="80"
@@ -576,13 +576,13 @@
                                 Must select entire object to set permissions.
                         </string>
                         <string name="Cost Default">
-                        Price:           L$
+                        Price:           [CURRENCY]
                         </string>
                         <string name="Cost Total">
-                        Total Price:  L$
+                        Total Price:  [CURRENCY]
                         </string>
                         <string name="Cost Per Unit">
-                        Price Per:     L$
+                        Price Per:     [CURRENCY]
                         </string>
                         <string name="Cost Mixed">
                         Mixed Price
@@ -1258,7 +1258,7 @@
                      bottom_delta="-24" drop_shadow_visible="true" follows="left|top"
                      font="SansSerifSmall" h_pad="0" halign="left" height="16" left="48"
                      mouse_opaque="true" name="label_area_price" v_pad="0" width="150">
-                        Price: L$[PRICE] for [AREA] sq. m.
+                        Price: [CURRENCY][PRICE] for [AREA] sq. m.
                 </text>
                 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                      bottom_delta="0" drop_shadow_visible="true" follows="left|top"
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index 242cc8f..6e286c6 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -11,23 +11,23 @@
     <menu label="Upload" create_jump_keys="true" name="Upload"
           opaque="true" tear_off="true">
       <menu_item_call name="Upload Image"
-                      label="Upload Image (L$[COST])..."
+                      label="Upload Image ([UPLOADFEE])..."
                       shortcut="control|U">
         <on_click function="File.UploadImage" userdata="" />
         <on_enable function="File.EnableUpload" />
       </menu_item_call>
       <menu_item_call name="Upload Sound"
-                      label="Upload Sound (L$[COST])...">
+                      label="Upload Sound ([UPLOADFEE])...">
         <on_click function="File.UploadSound" userdata="" />
         <on_enable function="File.EnableUpload" />
       </menu_item_call>
       <menu_item_call name="Upload Animation"
-                      label="Upload Animation (L$[COST])...">
+                      label="Upload Animation ([UPLOADFEE])...">
         <on_click function="File.UploadAnim" userdata="" />
         <on_enable function="File.EnableUpload" />
       </menu_item_call>
       <menu_item_call name="Bulk Upload"
-                      label="Bulk Upload (L$[COST] per file)...">
+                      label="Bulk Upload ([UPLOADFEE] per file)...">
         <on_click function="File.UploadBulk" userdata="" />
       </menu_item_call>
       <menu_item_separator />
@@ -41,7 +41,7 @@
       <on_enable function="Object.EnableImport" />
     </menu_item_call>
     <menu_item_call name="ImportUpload"
-                    label="Import + Upload...  (L$[COST] per texture)"
+                    label="Import + Upload...  ([UPLOADFEE] per texture)"
                     enabled="false">
       <on_click function="Object.ImportUpload" />
       <on_enable function="Object.EnableImport" />
@@ -504,7 +504,7 @@
       <on_click function="PromptShowURL" name="ManageMyAccount_url"
                 userdata="WebLaunchJoinNow,http://secondlife.com/account/" />
     </menu_item_call>
-    <menu_item_call name="Buy and Sell L$..." label="Buy L$...">
+    <menu_item_call name="Buy and Sell L$..." label="Buy [CURRENCY]...">
       <on_click function="ShowFloater" userdata="buy currency" />
     </menu_item_call>
     <menu_item_separator />
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index df277ad..2754b3a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -482,8 +482,8 @@ Add this Ability to &apos;[ROLE_NAME]&apos;?
    icon="alertmodal.tga"
    name="JoinGroupCanAfford"
    type="alertmodal">
-    Joining this group costs L$[COST].
-    Do you wish to proceed?
+Joining this group costs [CURRENCY][COST].
+Do you wish to proceed?
     <usetemplate
      name="okcancelbuttons"
      notext="Cancel"
@@ -494,15 +494,15 @@ Add this Ability to &apos;[ROLE_NAME]&apos;?
    icon="alertmodal.tga"
    name="JoinGroupCannotAfford"
    type="alertmodal">
-    Joining this group costs L$[COST].
-    You do not have enough L$ to join this group.
+Joining this group costs [CURRENCY][COST].
+You do not have enough [CURRENCY] to join this group.
   </notification>
 
   <notification
    icon="alertmodal.tga"
    name="LandBuyPass"
    type="alertmodal">
-    For L$[COST] you can enter this land (&apos;[PARCEL_NAME]&apos;) for [TIME] hours.  Buy a pass?
+For [CURRENCY][COST] you can enter this land (&apos;[PARCEL_NAME]&apos;) for [TIME] hours.  Buy a pass?
     <usetemplate
      name="okcancelbuttons"
      notext="Cancel"
@@ -513,8 +513,8 @@ Add this Ability to &apos;[ROLE_NAME]&apos;?
    icon="alertmodal.tga"
    name="SalePriceRestriction"
    type="alertmodal">
-    Sale price must be set to more than L$0 if selling to anyone.
-    Please select an individual to sell to if selling for L$0.
+Sale price must be set to more than [CURRENCY]0 if selling to anyone.
+Please select an individual to sell to if selling for [CURRENCY]0.
   </notification>
 
   <notification
@@ -522,8 +522,8 @@ Add this Ability to &apos;[ROLE_NAME]&apos;?
    name="ConfirmLandSaleChange"
    priority="high"
    type="alertmodal">
-    The selected [LAND_SIZE] m² land is being set for sale.
-    Your selling price will be L$[SALE_PRICE] and will be authorized for sale to [NAME].
+The selected [LAND_SIZE] m² land is being set for sale.
+Your selling price will be [CURRENCY][SALE_PRICE] and will be authorized for sale to [NAME].
     <usetemplate
      name="okcancelbuttons"
      notext="Cancel"
@@ -536,8 +536,8 @@ Add this Ability to &apos;[ROLE_NAME]&apos;?
    type="alertmodal">
     ATTENTION: Clicking &apos;sell to anyone&apos; makes your land available to the entire [GRID_NAME] community, even those not in this region.
 
-    The selected [LAND_SIZE] m² land is being set for sale.
-    Your selling price will be L$[SALE_PRICE] and will be authorized for sale to [NAME].
+The selected [LAND_SIZE] m² land is being set for sale.
+Your selling price will be [CURRENCY][SALE_PRICE] and will be authorized for sale to [NAME].
     <usetemplate
      name="okcancelbuttons"
      notext="Cancel"
@@ -1777,8 +1777,8 @@ Add this Ability to &apos;[ROLE_NAME]&apos;?
    icon="alertmodal.tga"
    name="ReleaseLandWarning"
    type="alertmodal">
-    You are about to release [AREA] m² of land.
-    Releasing this parcel will remove it from your land holdings, but will not grant any L$.
+You are about to release [AREA] m² of land.
+Releasing this parcel will remove it from your land holdings, but will not grant any [CURRENCY].
 
     Release this land?
     <usetemplate
@@ -2088,7 +2088,7 @@ Add this Ability to &apos;[ROLE_NAME]&apos;?
    icon="alertmodal.tga"
    name="MinClassifiedPrice"
    type="alertmodal">
-    Price to pay for listing must be at least L$[MIN_PRICE].
+Price to pay for listing must be at least [CURRENCY][MIN_PRICE].
 
     Please enter a higher price.
   </notification>
@@ -2368,7 +2368,7 @@ Add this Ability to &apos;[ROLE_NAME]&apos;?
    icon="alertmodal.tga"
    name="NotEnoughCurrency"
    type="alertmodal">
-    [NAME] L$ [PRICE] You don&apos;t have enough L$ to do that.
+[NAME] [CURRENCY] [PRICE] You don&apos;t have enough [CURRENCY] to do that.
   </notification>
 
   <notification
@@ -2560,7 +2560,7 @@ Add this Ability to &apos;[ROLE_NAME]&apos;?
    type="alertmodal">
     A new version of [VIEWER_NAME] is available.
     [MESSAGE]
-    You must download this update to use [GRID_NAME].
+    You must download this update to connect to [GRID_NAME].
     <usetemplate
      name="okcancelbuttons"
      notext="Quit"
@@ -2599,7 +2599,7 @@ Add this Ability to &apos;[ROLE_NAME]&apos;?
    type="alertmodal">
     A new version of [VIEWER_NAME] is available.
     [MESSAGE]
-    You must download this update to use [GRID_NAME].
+    You must download this update to connect to [GRID_NAME].
 
     Download to your Applications folder?
     <usetemplate
@@ -2642,8 +2642,8 @@ Add this Ability to &apos;[ROLE_NAME]&apos;?
    icon="alertmodal.tga"
    name="DeedObjectToGroup"
    type="alertmodal">
-    Deeding this object will cause the group to:
-    * Receive L$ paid into the object
+Deeding this object will cause the group to:
+* Receive [CURRENCY] paid into the object
     <usetemplate
      ignoretext="When deeding objects to groups"
      name="okcancelignore"
@@ -3074,8 +3074,8 @@ Add this Ability to &apos;[ROLE_NAME]&apos;?
    type="alert">
     You are about to change the access list for a Linden owned estate (mainland, teen grid, orientation, etc.).
 
-    This is DANGEROUS and should only be done to invoke the hack allowing objects/L$ to be transfered in/out of a grid.
-    It will change thousands of regions and make the spaceserver hiccup.
+This is DANGEROUS and should only be done to invoke the hack allowing objects/[CURRENCY] to be transfered in/out of a grid.
+It will change thousands of regions and make the spaceserver hiccup.
     <usetemplate
      name="okcancelbuttons"
      notext="Cancel"
@@ -3434,9 +3434,9 @@ Add this Ability to &apos;[ROLE_NAME]&apos;?
    icon="alert.tga"
    name="PublishClassified"
    type="alert">
-    Remember: Classified ad fees are non-refundable.
+Remember: Classified ad fees are non-refundable.
 
-    Publish this classified now for L$[AMOUNT]?
+Publish this classified now for [CURRENCY][AMOUNT]?
     <usetemplate
      name="okcancelbuttons"
      notext="Cancel"
@@ -3932,12 +3932,12 @@ Add this Ability to &apos;[ROLE_NAME]&apos;?
    icon="alertmodal.tga"
    name="BuyOriginal"
    type="alertmodal">
-    Buy original object from [OWNER] for L$[PRICE]?
-    You will become the owner of this object.
-    You will be able to:
-    Modify: [MODIFYPERM]
-    Copy: [COPYPERM]
-    Resell or Give Away: [RESELLPERM]
+Buy original object from [OWNER] for [CURRENCY][PRICE]?
+You will become the owner of this object.
+You will be able to:
+ Modify: [MODIFYPERM]
+ Copy: [COPYPERM]
+ Resell or Give Away: [RESELLPERM]
     <usetemplate
      name="okcancelbuttons"
      notext="Cancel"
@@ -3948,12 +3948,12 @@ Add this Ability to &apos;[ROLE_NAME]&apos;?
    icon="alertmodal.tga"
    name="BuyOriginalNoOwner"
    type="alertmodal">
-    Buy original object for L$[PRICE]?
-    You will become the owner of this object.
-    You will be able to:
-    Modify: [MODIFYPERM]
-    Copy: [COPYPERM]
-    Resell or Give Away: [RESELLPERM]
+Buy original object for [CURRENCY][PRICE]?
+You will become the owner of this object.
+You will be able to:
+ Modify: [MODIFYPERM]
+ Copy: [COPYPERM]
+ Resell or Give Away: [RESELLPERM]
     <usetemplate
      name="okcancelbuttons"
      notext="Cancel"
@@ -3964,12 +3964,12 @@ Add this Ability to &apos;[ROLE_NAME]&apos;?
    icon="alertmodal.tga"
    name="BuyCopy"
    type="alertmodal">
-    Buy a copy from [OWNER] for L$[PRICE]?
-    The object will be copied to your inventory.
-    You will be able to:
-    Modify: [MODIFYPERM]
-    Copy: [COPYPERM]
-    Resell or Give Away: [RESELLPERM]
+Buy a copy from [OWNER] for [CURRENCY][PRICE]?
+The object will be copied to your inventory.
+You will be able to:
+ Modify: [MODIFYPERM]
+ Copy: [COPYPERM]
+ Resell or Give Away: [RESELLPERM]
     <usetemplate
      name="okcancelbuttons"
      notext="Cancel"
@@ -3980,12 +3980,12 @@ Add this Ability to &apos;[ROLE_NAME]&apos;?
    icon="alertmodal.tga"
    name="BuyCopyNoOwner"
    type="alertmodal">
-    Buy a copy for L$[PRICE]?
-    The object will be copied to your inventory.
-    You will be able to:
-    Modify: [MODIFYPERM]
-    Copy: [COPYPERM]
-    Resell or Give Away: [RESELLPERM]
+Buy a copy for [CURRENCY][PRICE]?
+The object will be copied to your inventory.
+You will be able to:
+ Modify: [MODIFYPERM]
+ Copy: [COPYPERM]
+ Resell or Give Away: [RESELLPERM]
     <usetemplate
      name="okcancelbuttons"
      notext="Cancel"
@@ -3996,8 +3996,8 @@ Add this Ability to &apos;[ROLE_NAME]&apos;?
    icon="alertmodal.tga"
    name="BuyContents"
    type="alertmodal">
-    Buy contents from [OWNER] for L$[PRICE]?
-    They will be copied to your inventory.
+Buy contents from [OWNER] for [CURRENCY][PRICE]?
+They will be copied to your inventory.
     <usetemplate
      name="okcancelbuttons"
      notext="Cancel"
@@ -4008,8 +4008,8 @@ Add this Ability to &apos;[ROLE_NAME]&apos;?
    icon="alertmodal.tga"
    name="BuyContentsNoOwner"
    type="alertmodal">
-    Buy contents for L$[PRICE]?
-    They will be copied to your inventory.
+Buy contents for [CURRENCY][PRICE]?
+They will be copied to your inventory.
     <usetemplate
      name="okcancelbuttons"
      notext="Cancel"
@@ -4130,7 +4130,7 @@ Add this Ability to &apos;[ROLE_NAME]&apos;?
    icon="alertmodal.tga"
    name="ClickOpenF1Help"
    type="alertmodal">
-Visit the [GRID] Support Web site?
+Visit the [GRID_NAME] Support Web site?
     <usetemplate
      ignoretext="When visiting the Support Website."
      name="okcancelignore"
@@ -4142,7 +4142,7 @@ Visit the [GRID] Support Web site?
    icon="alertmodal.tga"
    name="NoSupportUrl"
    type="alertmodal">
-[GRID] has no link for support.
+[GRID_NAME] has no link for support.
   </notification>
 
   <notification
@@ -4896,7 +4896,7 @@ Visit the [GRID] Support Web site?
    label="About Requests for the Debit Permission"
    name="DebitPermissionDetails"
    type="alertmodal">
-    Granting this request gives a script ongoing permission to take Linden dollars (L$) from your account. To revoke this permission, the object owner must delete the object or reset the scripts in the object.
+Granting this request gives a script ongoing permission to take [CURRENCY] from your account. To revoke this permission, the object owner must delete the object or reset the scripts in the object.
     <usetemplate
      name="okbutton"
      yestext="OK"/>
@@ -5034,7 +5034,7 @@ Visit the [GRID] Support Web site?
    icon="notify.tga"
    name="UploadPayment"
    type="notify">
-    You paid L$[AMOUNT] to upload.
+You paid [CURRENCY][AMOUNT] to upload.
   </notification>
 
   <notification
@@ -6021,17 +6021,17 @@ Visit the [GRID] Support Web site?
    icon="notify.tga"
    name="FirstBalanceIncrease"
    type="notify">
-    You just received L$[AMOUNT].
-    Objects and other users may give you L$.
-    Your balance is shown in the upper-right corner of the screen.
+You just received [CURRENCY][AMOUNT].
+Objects and other users may give you [CURRENCY].
+Your balance is shown in the upper-right corner of the screen.
   </notification>
 
   <notification
    icon="notify.tga"
    name="FirstBalanceDecrease"
    type="notify">
-    You just paid L$[AMOUNT].
-    Your balance is shown in the upper-right corner of the screen.
+You just paid [CURRENCY][AMOUNT].
+Your balance is shown in the upper-right corner of the screen.
   </notification>
 
   <notification
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_avatar_classified.xml b/linden/indra/newview/skins/default/xui/en-us/panel_avatar_classified.xml
index 4f0836c..2c9ef99 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_avatar_classified.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_avatar_classified.xml
@@ -52,7 +52,7 @@
              height="20" label="Auto-renew each week" left="10" name="auto_renew_check"
              width="120" />
         <string name="ad_placed_paid">
-                Ad placed: [DATE], Paid L$[AMT] for listing.
+        Ad placed: [DATE], Paid [CURRENCY][AMT] for listing.
         </string>
         <string name="update_txt">
                 Update
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_classified.xml b/linden/indra/newview/skins/default/xui/en-us/panel_classified.xml
index cbc64d6..3c292e9 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_classified.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_classified.xml
@@ -40,7 +40,7 @@
         <button bottom="400" follows="left|top" height="20" label="Update" left="30"
              name="classified_update_btn" width="70" />
         <string name="ad_placed_paid">
-                Ad placed: [DATE], Paid L$[AMT] for listing.
+                Ad placed: [DATE], Paid [CURRENCY][AMT] for listing.
         </string>
         <string name="update_txt">
                 Update
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_friends.xml b/linden/indra/newview/skins/default/xui/en-us/panel_friends.xml
index 035c067..bf7acd4 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_friends.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_friends.xml
@@ -33,7 +33,7 @@
              tool_tip="Offer this friend a teleport to your current location" width="80" />
         <button bottom_delta="-25" follows="top|right" height="22" label="Pay..."
              left_delta="0" name="pay_btn"
-             tool_tip="Give Linden dollars (L$) to this friend" width="80" />
+             tool_tip="Give currency to this friend" width="80" />
         <button bottom_delta="-25" follows="top|right" height="22" label="Remove..."
              left_delta="0" name="remove_btn"
              tool_tip="Remove this person from your friends list" width="80" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_group_general.xml b/linden/indra/newview/skins/default/xui/en-us/panel_group_general.xml
index 2389569..3e2a34a 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_group_general.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_group_general.xml
@@ -51,7 +51,7 @@ Hover your mouse over the options for more help.
                 Group Charter
         </text_editor>
         <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-             height="22" label="Join (L$0)" label_selected="Join (L$0)" left="7"
+             height="22" label="Join (free)" label_selected="Join (free)" left="7"
              mouse_opaque="true" name="join_button" width="128" />
         <button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
              height="22" label="Detailed View" label_selected="Detailed View"
@@ -89,7 +89,7 @@ Hover your mouse over the options for more help.
                      tool_tip="Sets whether this group allows new members to join   without being invited."
                      width="95" />
                 <check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
-                     initial_value="false" label="Enrollment fee: L$" left_delta="16"
+                     initial_value="false" label="Enrollment fee: [CURRENCY]" left_delta="16"
                      max_length="5" mouse_opaque="true" name="check_enrollment_fee"
                      radio_style="false" 
                      tool_tip="Sets whether to require an enrollment fee to join the group."
@@ -97,10 +97,10 @@ Hover your mouse over the options for more help.
                 <spinner bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
                      bottom_delta="2" decimal_digits="0" drop_shadow_visible="true"
                      follows="left|top" font="SansSerif" h_pad="0" halign="left" height="16"
-                     increment="1" label_width="10" left_delta="116" max_val="99999" min_val="0"
-                     mouse_opaque="true" name="spin_enrollment_fee" right_delta="170"
+                     increment="1" label_width="10" left_delta="126" max_val="99999" min_val="0"
+                     mouse_opaque="true" name="spin_enrollment_fee" right_delta="160"
                      tool_tip="New members must pay this fee to join the group when   Enrollment Fee is checked."
-                     v_pad="0" width="65" />
+                     v_pad="0" width="55" />
                 <combo_box allow_text_entry="false" bottom_delta="-30" follows="left|top" height="20" left="6"
                         max_chars="20" mouse_opaque="true" name="group_mature_check" 
                         tool_tip="Sets whether your group information is considered mature."
@@ -139,8 +139,8 @@ Hover your mouse over the options for more help.
                 Retrieving member data
         </string>
         <string name="confirm_group_create_str">
-                Creating this group will cost L$100. 
-Are you really, really, REALLY sure you want to spend L$100 to create this group?
+                Creating this group will cost [GROUPCREATEFEE].
+Are you really, really, REALLY sure you want to spend [GROUPCREATEFEE] to create this group?
 Be aware that if nobody else joins this group within 48 hours, it will be disbanded and the group&apos;s name will be unavailable for future use.
         </string>
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_group_land_money.xml b/linden/indra/newview/skins/default/xui/en-us/panel_group_land_money.xml
index dcf6cfa..9341d4b 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_group_land_money.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_group_land_money.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel border="true" bottom="0" follows="all" height="470" label="Land &amp; L$"
+<panel border="true" bottom="0" follows="all" height="470" label="Land &amp; Money"
      left="1" mouse_opaque="true" name="land_money_tab" select="false"
      width="418">
         <string name="help_text">
@@ -107,7 +107,7 @@
              bottom_delta="-25" drop_shadow_visible="true" follows="left|top"
              font="SansSerifBig" h_pad="0" halign="left" height="16" left="12"
              mouse_opaque="true" name="group_money_heading" v_pad="0" width="150">
-                Group L$
+                Group [CURRENCY]
         </text>
         <tab_container border="false" bottom_delta="-189" height="180" left="6" mouse_opaque="false"
              name="group_money_tab_container" tab_position="top" width="406">
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_place.xml b/linden/indra/newview/skins/default/xui/en-us/panel_place.xml
index 171c9f8..d50aa53 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_place.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_place.xml
@@ -38,7 +38,7 @@
                 Area: [AREA] m². 
         </string>
         <string name="forsale_text">
-                For Sale for L$[PRICE]
+                For Sale for [CURRENCY][PRICE]
         </string>
         <string name="auction_text">
                 Auction ID [ID].
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_place_small.xml b/linden/indra/newview/skins/default/xui/en-us/panel_place_small.xml
index f2e4b7e..94024f9 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_place_small.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_place_small.xml
@@ -43,7 +43,7 @@
                 Area: [AREA] m². 
         </string>
         <string name="forsale_text">
-                For Sale for L$[PRICE]
+                For Sale for [CURRENCY][PRICE]
         </string>
         <string name="auction_text">
                 Auction ID [ID].
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
index 5926374..383c26f 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_audio.xml
@@ -56,14 +56,14 @@
              initial_val="1" label="Rolloff Factor" label_width="100" left="148"
              max_val="2" min_val="0" mouse_opaque="true" name="Rolloff Factor"
              show_text="true" width="250" />
-        <spinner bottom_delta="-20" control_name="UISndMoneyChangeThreshold" decimal_digits="0"
+        <spinner bottom_delta="-30" control_name="UISndMoneyChangeThreshold" decimal_digits="0"
              enabled="true" follows="left|top" height="16" increment="10"
-             initial_val="10" label="L$ Change Threshold" label_width="128" left="148"
+             initial_val="10" label="[CURRENCY] Change Threshold" label_width="158" left="148"
              max_val="10000" min_val="0" mouse_opaque="true" name="L$ Change Threshold"
-             width="192" />
+             width="212" />
         <spinner bottom_delta="-20" control_name="UISndHealthReductionThreshold"
              decimal_digits="0" enabled="true" follows="left|top" height="16"
              increment="10" initial_val="20" label="Health Change Threshold"
-             label_width="128" left="148" max_val="10000" min_val="0"
-             mouse_opaque="true" name="Health Change Threshold" width="192" />
+             label_width="158" left="148" max_val="10000" min_val="0"
+             mouse_opaque="true" name="Health Change Threshold" width="212" />
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_popups.xml b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_popups.xml
index d724256..35a10a6 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_preferences_popups.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_preferences_popups.xml
@@ -41,7 +41,7 @@
              name="show_in_inventory" radio_style="false" width="270" />
   <check_box bottom_delta="-30" enabled="true"
        follows="left|top" font="SansSerifSmall" height="16" initial_value="false"
-       label="Notify when Linden dollars (L$) spent or received" left="15"
+       label="Notify when [CURRENCY] spent or received" left="15"
        mouse_opaque="true" name="notify_money_change_checkbox" radio_style="false"
        width="256" />
 </panel>
diff --git a/linden/indra/newview/skins/default/xui/en-us/strings.xml b/linden/indra/newview/skins/default/xui/en-us/strings.xml
index fd4fb58..91b2f6d 100644
--- a/linden/indra/newview/skins/default/xui/en-us/strings.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/strings.xml
@@ -4,212 +4,221 @@
      For example, the strings used in avatar chat bubbles, and strings 
      that are returned from one component and may appear in many places-->
 <strings>
-        
-        <!-- Login -->
-        <string name="LoginInProgress">Logging in. [APP_NAME] may appear frozen.  Please wait.</string>
-        <string name="LoginAuthenticating">Authenticating</string>
-        <string name="LoginMaintenance">Performing account maintenance...</string>
-        <string name="LoginAttempt">Previous login attempt failed. Logging in, attempt [NUMBER]</string>
-        <string name="LoginPrecaching">Loading world...</string>
-        <string name="LoginInitializingBrowser">Initializing embedded web browser...</string>
-        <string name="LoginInitializingMultimedia">Initializing multimedia...</string>
-        <string name="LoginVerifyingCache">Verifying cache files (can take 60-90 seconds)...</string>
-        <string name="LoginProcessingResponse">Processing Response...</string>
-        <string name="LoginInitializingWorld">Initializing World...</string>
-        <string name="LoginDecodingImages">Decoding images...</string>
-        <string name="LoginInitializingQuicktime">Initializing QuickTime...</string>
-        <string name="LoginQuicktimeNotFound">QuickTime not found - unable to initialize.</string>
-        <string name="LoginQuicktimeOK">QuickTime initialized successfully.</string>
-        <string name="LoginWaitingForRegionHandshake">Waiting for region handshake...</string>
-        <string name="LoginConnectingToRegion">Connecting to region...</string>
-        <string name="LoginDownloadingClothing">Downloading clothing...</string>
-
-
-        <!-- Disconnection -->
-        <string name="AgentLostConnection">This region may be experiencing trouble.  Please check your connection to the Internet.</string>
-        
-        
-        <!-- Tooltip, llhoverview.cpp -->
-        <string name="TooltipPerson">Person</string><!-- Object under mouse pointer is an avatar -->
-        <string name="TooltipNoName">(no name)</string> <!-- No name on an object -->
-        <string name="TooltipOwner">Owner:</string> <!-- Owner name follows -->
-        <string name="TooltipPublic">Public</string> <!-- Public permissions on an object -->
-        <string name="TooltipIsGroup">(Group)</string> <!-- The name before this text is that of a group -->
-        <string name="TooltipFlagScript">Script</string>
-        <string name="TooltipFlagPhysics">Physics</string>
-        <string name="TooltipFlagTouch">Touch</string>
-        <string name="TooltipFlagL$">L$</string>
-        <string name="TooltipFlagDropInventory">Drop Inventory</string>
-        <string name="TooltipFlagPhantom">Phantom</string>
-        <string name="TooltipFlagTemporary">Temporary</string>
-        <string name="TooltipFlagRightClickMenu">(Right-click for menu)</string>
-        <string name="TooltipFreeToCopy">Free to copy</string>
-        <string name="TooltipForSaleL$">For Sale: L$[AMOUNT]</string> <!-- L$ version -->
-        <string name="TooltipForSaleMsg">For Sale: [MESSAGE]</string> <!-- Message (RetrievingData) -->
-        <string name="TooltipFlagGroupBuild">Group Build</string>
-        <string name="TooltipFlagNoBuild">No Build</string>
-        <string name="TooltipFlagNoEdit">Group Build</string>
-        <string name="TooltipFlagNotSafe">Not Safe</string><!-- damage area -->
-        <string name="TooltipFlagNoFly">No Fly</string>
-        <string name="TooltipFlagGroupScripts">Group Scripts</string>
-        <string name="TooltipFlagNoScripts">No Scripts</string>
-        <string name="TooltipLand">Land:</string>
-        <string name="TooltipMustSingleDrop">Only a single item can be dragged here</string>    
-
-        
-        <!-- Indicates that an avatar name or other similar datum is being retrieved. General usage. -->
-        <string name="RetrievingData">Retrieving...</string>
-
-        <string name="ReleaseNotes">Release Notes</string>
-
-        <!-- Indicates something is being loaded. Maybe should be merged with RetrievingData -->
-        <string name="LoadingData">Loading...</string>
-        
-        
-        <!-- namecache -->
-        <!-- Avatar name: text shown for LLUUID::null -->
-        <string name="AvatarNameNobody">(nobody)</string>
-        
-        <!-- Avatar name: text shown while fetching name -->
-        <string name="AvatarNameWaiting">(waiting)</string>
-
-        <!-- Avatar name: text shown as an alternative to AvatarNameFetching, easter egg. -->
-        <string name="AvatarNameHippos">(hippos)</string>
-        
-        <!-- Group name: text shown for LLUUID::null -->
-        <string name="GroupNameNone">(none)</string>
-        
-        <!-- Asset errors. Used in llassetstorage.cpp, translation from error code to error message. -->
-        <string name="AssetErrorNone">No error</string>
-        <string name="AssetErrorRequestFailed">Asset request: failed</string>
-        <string name="AssetErrorNonexistentFile">Asset request: non-existent file</string>
-        <string name="AssetErrorNotInDatabase">Asset request: asset not found in database</string>
-        <string name="AssetErrorEOF">End of file</string>
-        <string name="AssetErrorCannotOpenFile">Cannot open file</string>
-        <string name="AssetErrorFileNotFound">File not found</string>
-        <string name="AssetErrorTCPTimeout">File transfer timeout</string>
-        <string name="AssetErrorCircuitGone">Circuit gone</string>
-        <string name="AssetErrorPriceMismatch">Viewer and server do not agree on price</string>
-        <string name="AssetErrorUnknownStatus">Unknown status</string>
-        
-        <!-- llvoavatar. Displayed in the avatar chat bubble -->
-        <string name="AvatarEditingApparance">(Editing Appearance)</string>
-        <string name="AvatarAway">Away</string>
-        <string name="AvatarBusy">Busy</string>
-        <string name="AvatarMuted">Muted</string>
-
-        <!-- animations -->
-        <string name="anim_express_afraid">Afraid</string>
-        <string name="anim_express_anger">Angry</string>
-        <string name="anim_away">Away</string>
-        <string name="anim_backflip">Backflip</string>
-        <string name="anim_express_laugh">Belly Laugh</string>
-        <string name="anim_express_toothsmile">BigSmile</string>
-        <string name="anim_blowkiss">Blow Kiss</string>
-        <string name="anim_express_bored">Bored</string>
-        <string name="anim_bow">Bow</string>
-        <string name="anim_clap">Clap</string>
-        <string name="anim_courtbow">Court Bow</string>
-        <string name="anim_express_cry">Cry</string>
-        <string name="anim_dance1">Dance 1</string>
-        <string name="anim_dance2">Dance 2</string>
-        <string name="anim_dance3">Dance 3</string>
-        <string name="anim_dance4">Dance 4</string>
-        <string name="anim_dance5">Dance 5</string>
-        <string name="anim_dance6">Dance 6</string>
-        <string name="anim_dance7">Dance 7</string>
-        <string name="anim_dance8">Dance 8</string>
-        <string name="anim_express_disdain">Disdain</string>
-        <string name="anim_drink">Drink</string>
-        <string name="anim_express_embarrased">Embarrassed</string>
-        <string name="anim_angry_fingerwag">Finger Wag</string>
-        <string name="anim_fist_pump">Fist Pump</string>
-        <string name="anim_yoga_float">Floating Yoga</string>
-        <string name="anim_express_frown">Frown</string>
-        <string name="anim_impatient">Impatient</string>
-        <string name="anim_jumpforjoy">Jump For Joy</string>
-        <string name="anim_kissmybutt">Kiss My Butt</string>
-        <string name="anim_express_kiss">Kiss</string>
-        <string name="anim_laugh_short">Laugh</string>
-        <string name="anim_musclebeach">Muscle Beach</string>
-        <string name="anim_no_unhappy">No (Unhappy)</string>
-        <string name="anim_no_head">No</string>
-        <string name="anim_nyanya">Nya-nya-nya</string>
-        <string name="anim_punch_onetwo">One-Two Punch</string>
-        <string name="anim_express_open_mouth">Open Mouth</string>
-        <string name="anim_peace">Peace</string>
-        <string name="anim_point_you">Point at Other</string>
-        <string name="anim_point_me">Point at Self</string>
-        <string name="anim_punch_l">Punch Left</string>
-        <string name="anim_punch_r">Punch Right</string>
-        <string name="anim_rps_countdown">RPS count</string>
-        <string name="anim_rps_paper">RPS paper</string>
-        <string name="anim_rps_rock">RPS rock</string>
-        <string name="anim_rps_scissors">RPS scissors</string>
-        <string name="anim_express_repulsed">Repulsed</string>
-        <string name="anim_kick_roundhouse_r">Roundhouse Kick</string>
-        <string name="anim_express_sad">Sad</string>
-        <string name="anim_salute">Salute</string>
-        <string name="anim_shout">Shout</string>
-        <string name="anim_express_shrug">Shrug</string>
-        <string name="anim_express_smile">Smile</string>
-        <string name="anim_smoke_idle">Smoke Idle</string>
-        <string name="anim_smoke_inhale">Smoke Inhale</string>
-        <string name="anim_smoke_throw_down">Smoke Throw Down</string>
-        <string name="anim_express_surprise">Surprise</string>
-        <string name="anim_sword_strike_r">Sword Strike</string>
-        <string name="anim_angry_tantrum">Tantrum</string>
-        <string name="anim_express_tongue_out">TongueOut</string>
-        <string name="anim_hello">Wave</string>
-        <string name="anim_whisper">Whisper</string>
-        <string name="anim_whistle">Whistle</string>
-        <string name="anim_express_wink">Wink</string>
-        <string name="anim_wink_hollywood">Wink (Hollywood)</string>
-        <string name="anim_express_worry">Worry</string>
-        <string name="anim_yes_happy">Yes (Happy)</string>
-        <string name="anim_yes_head">Yes</string>
-        
-        <string name="texture_loading">Loading...</string>
-        <string name="worldmap_offline">Offline</string>
-        
-        <!-- Chat -->
-        <string name="whisper">whispers:</string>
-        <string name="shout">shouts:</string>
-        
-        <!-- Sim Access labels -->
-        <string name="SIM_ACCESS_PG">PG</string>
-        <string name="SIM_ACCESS_MATURE">Mature</string>
-        <string name="SIM_ACCESS_ADULT">Adult</string>
-        <string name="SIM_ACCESS_DOWN">Offline</string>
-        <string name="SIM_ACCESS_MIN">Unknown</string>
-        
-        <!-- For use when we do not have land type back from the server -->
-        <string name="land_type_unknown">(unknown)</string>
-        
-        <!-- Covenant info -->
-        <string name="covenant_never_modified">Last Modified: (never)</string>
-        <string name="covenant_modified">Last Modified: </string>
-
-        <!-- File load/save dialogs -->
-        <string name="all_files">All Files</string>
-        <string name="sound_files">Sounds</string>
-        <string name="animation_files">Animations</string>
-        <string name="image_files">Images</string>
-        <string name="save_file_verb">Save</string>
-        <string name="load_file_verb">Load</string>
-        <string name="targa_image_files">Targa Images</string>
-        <string name="bitmap_image_files">Bitmap Images</string>
-        <string name="avi_movie_file">AVI Movie File</string>
-        <string name="xaf_animation_file">XAF Anim File</string>
-        <string name="xml_file">XML File</string>
-        <string name="dot_raw_file">RAW File</string>
-        <string name="compressed_image_files">Compressed Images</string>
-        <string name="load_files">Load Files</string>
-        <string name="choose_the_directory">Choose Directory</string>
 
-  <!-- System messages -->
+  <!-- Imprudence-specific strings -->
   <string name="landmark_created">You created a landmark at</string>
   <string name="new_home_page">Your new Home Page is</string>
+  <string name="hippo_label_free">free</string>
+  <string name="hippo_label_week">week</string>
+
+  <!-- Login -->
+  <string name="LoginInProgress">Logging in. [APP_NAME] may appear frozen.  Please wait.</string>
+  <string name="LoginAuthenticating">Authenticating</string>
+  <string name="LoginMaintenance">Performing account maintenance...</string>
+  <string name="LoginAttempt">Previous login attempt failed. Logging in, attempt [NUMBER]</string>
+  <string name="LoginPrecaching">Loading world...</string>
+  <string name="LoginInitializingBrowser">Initializing embedded web browser...</string>
+  <string name="LoginInitializingMultimedia">Initializing multimedia...</string>
+  <string name="LoginVerifyingCache">Verifying cache files (can take 60-90 seconds)...</string>
+  <string name="LoginProcessingResponse">Processing Response...</string>
+  <string name="LoginInitializingWorld">Initializing World...</string>
+  <string name="LoginDecodingImages">Decoding images...</string>
+  <string name="LoginInitializingQuicktime">Initializing QuickTime...</string>
+  <string name="LoginQuicktimeNotFound">QuickTime not found - unable to initialize.</string>
+  <string name="LoginQuicktimeOK">QuickTime initialized successfully.</string>
+  <string name="LoginWaitingForRegionHandshake">Waiting for region handshake...</string>
+  <string name="LoginConnectingToRegion">Connecting to region...</string>
+  <string name="LoginDownloadingClothing">Downloading clothing...</string>
+
+
+  <!-- Disconnection -->
+  <string name="AgentLostConnection">This region may be experiencing trouble.  Please check your connection to the Internet.</string>
+
+
+  <!-- Tooltip, llhoverview.cpp -->
+  <string name="TooltipPerson">Person</string>
+  <!-- Object under mouse pointer is an avatar -->
+  <string name="TooltipNoName">(no name)</string>
+  <!-- No name on an object -->
+  <string name="TooltipOwner">Owner:</string>
+  <!-- Owner name follows -->
+  <string name="TooltipPublic">Public</string>
+  <!-- Public permissions on an object -->
+  <string name="TooltipIsGroup">(Group)</string>
+  <!-- The name before this text is that of a group -->
+  <string name="TooltipFlagScript">Script</string>
+  <string name="TooltipFlagPhysics">Physics</string>
+  <string name="TooltipFlagTouch">Touch</string>
+  <string name="TooltipFlagDropInventory">Drop Inventory</string>
+  <string name="TooltipFlagPhantom">Phantom</string>
+  <string name="TooltipFlagTemporary">Temporary</string>
+  <string name="TooltipFlagRightClickMenu">(Right-click for menu)</string>
+  <string name="TooltipFreeToCopy">Free to copy</string>
+  <string name="TooltipForSaleL$">For Sale: [CURRENCY][AMOUNT]</string>
+  <!-- L$ version -->
+  <string name="TooltipForSaleMsg">For Sale: [MESSAGE]</string>
+  <!-- Message (RetrievingData) -->
+  <string name="TooltipFlagGroupBuild">Group Build</string>
+  <string name="TooltipFlagNoBuild">No Build</string>
+  <string name="TooltipFlagNoEdit">Group Build</string>
+  <string name="TooltipFlagNotSafe">Not Safe</string>
+  <!-- damage area -->
+  <string name="TooltipFlagNoFly">No Fly</string>
+  <string name="TooltipFlagGroupScripts">Group Scripts</string>
+  <string name="TooltipFlagNoScripts">No Scripts</string>
+  <string name="TooltipLand">Land:</string>
+  <string name="TooltipMustSingleDrop">Only a single item can be dragged here</string>
+
+
+  <!-- Indicates that an avatar name or other similar datum is being retrieved. General usage. -->
+  <string name="RetrievingData">Retrieving...</string>
+
+  <string name="ReleaseNotes">Release Notes</string>
+
+  <!-- Indicates something is being loaded. Maybe should be merged with RetrievingData -->
+  <string name="LoadingData">Loading...</string>
+
+
+  <!-- namecache -->
+  <!-- Avatar name: text shown for LLUUID::null -->
+  <string name="AvatarNameNobody">(nobody)</string>
+
+  <!-- Avatar name: text shown while fetching name -->
+  <string name="AvatarNameWaiting">(waiting)</string>
+
+  <!-- Avatar name: text shown as an alternative to AvatarNameFetching, easter egg. -->
+  <string name="AvatarNameHippos">(hippos)</string>
+
+  <!-- Group name: text shown for LLUUID::null -->
+  <string name="GroupNameNone">(none)</string>
+
+  <!-- Asset errors. Used in llassetstorage.cpp, translation from error code to error message. -->
+  <string name="AssetErrorNone">No error</string>
+  <string name="AssetErrorRequestFailed">Asset request: failed</string>
+  <string name="AssetErrorNonexistentFile">Asset request: non-existent file</string>
+  <string name="AssetErrorNotInDatabase">Asset request: asset not found in database</string>
+  <string name="AssetErrorEOF">End of file</string>
+  <string name="AssetErrorCannotOpenFile">Cannot open file</string>
+  <string name="AssetErrorFileNotFound">File not found</string>
+  <string name="AssetErrorTCPTimeout">File transfer timeout</string>
+  <string name="AssetErrorCircuitGone">Circuit gone</string>
+  <string name="AssetErrorPriceMismatch">Viewer and server do not agree on price</string>
+  <string name="AssetErrorUnknownStatus">Unknown status</string>
+
+  <!-- llvoavatar. Displayed in the avatar chat bubble -->
+  <string name="AvatarEditingApparance">(Editing Appearance)</string>
+  <string name="AvatarAway">Away</string>
+  <string name="AvatarBusy">Busy</string>
+  <string name="AvatarMuted">Muted</string>
+
+  <!-- animations -->
+  <string name="anim_express_afraid">Afraid</string>
+  <string name="anim_express_anger">Angry</string>
+  <string name="anim_away">Away</string>
+  <string name="anim_backflip">Backflip</string>
+  <string name="anim_express_laugh">Belly Laugh</string>
+  <string name="anim_express_toothsmile">BigSmile</string>
+  <string name="anim_blowkiss">Blow Kiss</string>
+  <string name="anim_express_bored">Bored</string>
+  <string name="anim_bow">Bow</string>
+  <string name="anim_clap">Clap</string>
+  <string name="anim_courtbow">Court Bow</string>
+  <string name="anim_express_cry">Cry</string>
+  <string name="anim_dance1">Dance 1</string>
+  <string name="anim_dance2">Dance 2</string>
+  <string name="anim_dance3">Dance 3</string>
+  <string name="anim_dance4">Dance 4</string>
+  <string name="anim_dance5">Dance 5</string>
+  <string name="anim_dance6">Dance 6</string>
+  <string name="anim_dance7">Dance 7</string>
+  <string name="anim_dance8">Dance 8</string>
+  <string name="anim_express_disdain">Disdain</string>
+  <string name="anim_drink">Drink</string>
+  <string name="anim_express_embarrased">Embarrassed</string>
+  <string name="anim_angry_fingerwag">Finger Wag</string>
+  <string name="anim_fist_pump">Fist Pump</string>
+  <string name="anim_yoga_float">Floating Yoga</string>
+  <string name="anim_express_frown">Frown</string>
+  <string name="anim_impatient">Impatient</string>
+  <string name="anim_jumpforjoy">Jump For Joy</string>
+  <string name="anim_kissmybutt">Kiss My Butt</string>
+  <string name="anim_express_kiss">Kiss</string>
+  <string name="anim_laugh_short">Laugh</string>
+  <string name="anim_musclebeach">Muscle Beach</string>
+  <string name="anim_no_unhappy">No (Unhappy)</string>
+  <string name="anim_no_head">No</string>
+  <string name="anim_nyanya">Nya-nya-nya</string>
+  <string name="anim_punch_onetwo">One-Two Punch</string>
+  <string name="anim_express_open_mouth">Open Mouth</string>
+  <string name="anim_peace">Peace</string>
+  <string name="anim_point_you">Point at Other</string>
+  <string name="anim_point_me">Point at Self</string>
+  <string name="anim_punch_l">Punch Left</string>
+  <string name="anim_punch_r">Punch Right</string>
+  <string name="anim_rps_countdown">RPS count</string>
+  <string name="anim_rps_paper">RPS paper</string>
+  <string name="anim_rps_rock">RPS rock</string>
+  <string name="anim_rps_scissors">RPS scissors</string>
+  <string name="anim_express_repulsed">Repulsed</string>
+  <string name="anim_kick_roundhouse_r">Roundhouse Kick</string>
+  <string name="anim_express_sad">Sad</string>
+  <string name="anim_salute">Salute</string>
+  <string name="anim_shout">Shout</string>
+  <string name="anim_express_shrug">Shrug</string>
+  <string name="anim_express_smile">Smile</string>
+  <string name="anim_smoke_idle">Smoke Idle</string>
+  <string name="anim_smoke_inhale">Smoke Inhale</string>
+  <string name="anim_smoke_throw_down">Smoke Throw Down</string>
+  <string name="anim_express_surprise">Surprise</string>
+  <string name="anim_sword_strike_r">Sword Strike</string>
+  <string name="anim_angry_tantrum">Tantrum</string>
+  <string name="anim_express_tongue_out">TongueOut</string>
+  <string name="anim_hello">Wave</string>
+  <string name="anim_whisper">Whisper</string>
+  <string name="anim_whistle">Whistle</string>
+  <string name="anim_express_wink">Wink</string>
+  <string name="anim_wink_hollywood">Wink (Hollywood)</string>
+  <string name="anim_express_worry">Worry</string>
+  <string name="anim_yes_happy">Yes (Happy)</string>
+  <string name="anim_yes_head">Yes</string>
+
+  <string name="texture_loading">Loading...</string>
+  <string name="worldmap_offline">Offline</string>
+
+  <!-- Chat -->
+  <string name="whisper">whispers:</string>
+  <string name="shout">shouts:</string>
+
+  <!-- Sim Access labels -->
+  <string name="SIM_ACCESS_PG">PG</string>
+  <string name="SIM_ACCESS_MATURE">Mature</string>
+  <string name="SIM_ACCESS_ADULT">Adult</string>
+  <string name="SIM_ACCESS_DOWN">Offline</string>
+  <string name="SIM_ACCESS_MIN">Unknown</string>
+
+  <!-- For use when we do not have land type back from the server -->
+  <string name="land_type_unknown">(unknown)</string>
+
+  <!-- Covenant info -->
+  <string name="covenant_never_modified">Last Modified: (never)</string>
+  <string name="covenant_modified">Last Modified: </string>
+
+  <!-- File load/save dialogs -->
+  <string name="all_files">All Files</string>
+  <string name="sound_files">Sounds</string>
+  <string name="animation_files">Animations</string>
+  <string name="image_files">Images</string>
+  <string name="save_file_verb">Save</string>
+  <string name="load_file_verb">Load</string>
+  <string name="targa_image_files">Targa Images</string>
+  <string name="bitmap_image_files">Bitmap Images</string>
+  <string name="avi_movie_file">AVI Movie File</string>
+  <string name="xaf_animation_file">XAF Anim File</string>
+  <string name="xml_file">XML File</string>
+  <string name="dot_raw_file">RAW File</string>
+        <string name="compressed_image_files">Compressed Images</string>
+        <string name="load_files">Load Files</string>
+        <string name="choose_the_directory">Choose Directory</string>
 
 </strings>