aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llstatusbar.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llstatusbar.cpp')
-rw-r--r--linden/indra/newview/llstatusbar.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/linden/indra/newview/llstatusbar.cpp b/linden/indra/newview/llstatusbar.cpp
index 4998981..4579100 100644
--- a/linden/indra/newview/llstatusbar.cpp
+++ b/linden/indra/newview/llstatusbar.cpp
@@ -93,6 +93,9 @@ LLStatusBar *gStatusBar = NULL;
93S32 STATUS_BAR_HEIGHT = 0; 93S32 STATUS_BAR_HEIGHT = 0;
94extern S32 MENU_BAR_HEIGHT; 94extern S32 MENU_BAR_HEIGHT;
95 95
96// [RLVa:KB]
97#include "rlvhandler.h"
98// [/RLVa:KB]
96 99
97// TODO: these values ought to be in the XML too 100// TODO: these values ought to be in the XML too
98const S32 MENU_PARCEL_SPACING = 1; // Distance from right of menu item to parcel information 101const S32 MENU_PARCEL_SPACING = 1; // Distance from right of menu item to parcel information
@@ -539,7 +542,8 @@ void LLStatusBar::refresh()
539 { 542 {
540 // TODO-RLVa: find out whether the LCD code is still used because if so then we need to filter that as well 543 // TODO-RLVa: find out whether the LCD code is still used because if so then we need to filter that as well
541 location_name = llformat("%s (%s) - %s", 544 location_name = llformat("%s (%s) - %s",
542 rlv_handler_t::cstrHiddenRegion.c_str(), region->getSimAccessString().c_str(), rlv_handler_t::cstrHidden.c_str()); 545 RlvStrings::getString(RLV_STRING_HIDDEN_REGION).c_str(), region->getSimAccessString().c_str(),
546 RlvStrings::getString(RLV_STRING_HIDDEN).c_str());
543 } 547 }
544// [/RLVa:KB] 548// [/RLVa:KB]
545 549
@@ -577,7 +581,7 @@ void LLStatusBar::refresh()
577 childGetRect("BalanceText", r); 581 childGetRect("BalanceText", r);
578 r.translate( new_right - r.mRight, 0); 582 r.translate( new_right - r.mRight, 0);
579 childSetRect("BalanceText", r); 583 childSetRect("BalanceText", r);
580 new_right -= r.getWidth() - 18; 584 new_right -= r.getWidth() - 2;
581 585
582 childGetRect("buycurrency", r); 586 childGetRect("buycurrency", r);
583 r.translate( new_right - r.mRight, 0); 587 r.translate( new_right - r.mRight, 0);