1 files changed, 10 insertions, 1 deletions

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);
                 }