summaryrefslogtreecommitdiff
path: root/indra/newview/llstatusbar.cpp
diff options
context:
space:
mode:
authorYuri Chebotarev <ychebotarev@productengine.com>2010-05-26 11:41:33 +0300
committerYuri Chebotarev <ychebotarev@productengine.com>2010-05-26 11:41:33 +0300
commita8978c1b52ad03bcfdfde99cde988ef663e5b9cd (patch)
tree2d5f73a7c1bb2ac5a8cb5761d7c6f979e267f9b7 /indra/newview/llstatusbar.cpp
parentdaa8d2b823fa0ca2a084bfbb38a7ee04720e6829 (diff)
parent14418c197076d0eb01bb0852b8716fa966bc9d53 (diff)
merge
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llstatusbar.cpp')
-rw-r--r--indra/newview/llstatusbar.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index b660a2b8ea..5628205dd4 100644
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -41,6 +41,7 @@
#include "llcommandhandler.h"
#include "llviewercontrol.h"
#include "llfloaterbuycurrency.h"
+#include "llbuycurrencyhtml.h"
#include "llfloaterlagmeter.h"
#include "llpanelnearbymedia.h"
#include "llpanelvolumepulldown.h"
@@ -509,7 +510,9 @@ S32 LLStatusBar::getSquareMetersLeft() const
void LLStatusBar::onClickBuyCurrency()
{
- LLFloaterBuyCurrency::buyCurrency();
+ // open a currency floater - actual one open depends on
+ // value specified in settings.xml
+ LLBuyCurrencyHTML::openCurrencyFloater();
}
static void onClickHealth(void* )