diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-05-25 13:29:30 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-05-25 13:29:30 +0300 |
| commit | 8c83a6ca620c46a7df23ab6e567bfb29dc98d1a7 (patch) | |
| tree | b137e30f11ca0ed48a5390a2edf5d9343543ab6e /indra/newview/llstatusbar.cpp | |
| parent | 3ec7c76abee043d6b3bf419998a351523aee70d9 (diff) | |
| parent | 2a99af8d949b982ea5832735c61ca249554f5b02 (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llstatusbar.cpp')
| -rw-r--r-- | indra/newview/llstatusbar.cpp | 5 |
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* ) |