diff options
author | McCabe Maxsted | 2010-04-26 20:06:23 -0700 |
---|---|---|
committer | McCabe Maxsted | 2010-04-26 20:06:23 -0700 |
commit | e563e2c2cc66fa9f3b47c4814d70f9800d957026 (patch) | |
tree | a2a9ca5bfeaf747b76b744f007da061ad15110c2 /linden/indra/newview/llpanelland.cpp | |
parent | Merge commit 'jacek/next' into next (diff) | |
download | meta-impy-e563e2c2cc66fa9f3b47c4814d70f9800d957026.zip meta-impy-e563e2c2cc66fa9f3b47c4814d70f9800d957026.tar.gz meta-impy-e563e2c2cc66fa9f3b47c4814d70f9800d957026.tar.bz2 meta-impy-e563e2c2cc66fa9f3b47c4814d70f9800d957026.tar.xz |
Ported currency changes from Hippo (#237) and fixed some labels Hippo missed (also fixed #200 in the process)
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llpanelland.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
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 @@ | |||
49 | 49 | ||
50 | #include "lluictrlfactory.h" | 50 | #include "lluictrlfactory.h" |
51 | 51 | ||
52 | #include "hippoGridManager.h" | ||
53 | |||
52 | LLPanelLandSelectObserver* LLPanelLandInfo::sObserver = NULL; | 54 | LLPanelLandSelectObserver* LLPanelLandInfo::sObserver = NULL; |
53 | LLPanelLandInfo* LLPanelLandInfo::sInstance = NULL; | 55 | LLPanelLandInfo* LLPanelLandInfo::sInstance = NULL; |
54 | 56 | ||
@@ -213,6 +215,7 @@ void LLPanelLandInfo::refresh() | |||
213 | &dwell); | 215 | &dwell); |
214 | if(is_public || (is_for_sale && LLViewerParcelMgr::getInstance()->getParcelSelection()->getWholeParcelSelected())) | 216 | if(is_public || (is_for_sale && LLViewerParcelMgr::getInstance()->getParcelSelection()->getWholeParcelSelected())) |
215 | { | 217 | { |
218 | childSetTextArg("label_area_price","[CURRENCY]", gHippoGridManager->getConnectedGrid()->getCurrencySymbol()); | ||
216 | childSetTextArg("label_area_price","[PRICE]", llformat("%d",claim_price)); | 219 | childSetTextArg("label_area_price","[PRICE]", llformat("%d",claim_price)); |
217 | childSetTextArg("label_area_price","[AREA]", llformat("%d",area)); | 220 | childSetTextArg("label_area_price","[AREA]", llformat("%d",area)); |
218 | childSetVisible("label_area_price",true); | 221 | childSetVisible("label_area_price",true); |