From 3329e607a6d20fcccd3a23258610e729376f5e6b Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Fri, 17 Sep 2010 01:25:49 -0700 Subject: Fixed missing [CURRENCY] in god tools and deleted an unused xml file (thanks Eryn) --- linden/indra/newview/llfloatergodtools.cpp | 4 + .../skins/default/xui/en-us/floater_god_tools.xml | 2 +- .../skins/default/xui/en-us/floater_group_info.xml | 657 --------------------- 3 files changed, 5 insertions(+), 658 deletions(-) delete mode 100644 linden/indra/newview/skins/default/xui/en-us/floater_group_info.xml diff --git a/linden/indra/newview/llfloatergodtools.cpp b/linden/indra/newview/llfloatergodtools.cpp index 4959a29..2bbbc65 100644 --- a/linden/indra/newview/llfloatergodtools.cpp +++ b/linden/indra/newview/llfloatergodtools.cpp @@ -77,6 +77,8 @@ #include "lltransfertargetfile.h" #include "lltransfersourcefile.h" +#include "hippoGridManager.h" + const F32 SECONDS_BETWEEN_UPDATE_REQUESTS = 5.0f; static LLFloaterGodTools* sGodTools = NULL; @@ -135,6 +137,8 @@ LLFloaterGodTools::LLFloaterGodTools() sendRegionInfoRequest(); childShowTab("GodTools Tabs", "region"); + + childSetTextArg("land cost text", "[CURRENCY]", gHippoGridManager->getConnectedGrid()->getCurrencySymbol()); } // static diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_god_tools.xml b/linden/indra/newview/skins/default/xui/en-us/floater_god_tools.xml index ee70387..9ce4b54 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_god_tools.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_god_tools.xml @@ -133,7 +133,7 @@ bottom="-146" drop_shadow_visible="true" follows="left|top" font="SansSerif" h_pad="0" halign="left" height="16" left_delta="-108" mouse_opaque="true" name="land cost text" v_pad="0" width="110"> - L$ per sq. meter: + [CURRENCY] per sq. meter: