diff options
author | James Cook <james@lindenlab.com> | 2010-05-25 11:41:33 -0700 |
---|---|---|
committer | James Cook <james@lindenlab.com> | 2010-05-25 11:41:33 -0700 |
commit | a91d10dc1806d1931c7f1361bfcf70df59d982d5 (patch) | |
tree | 20f2940d888aaf71c54ff1e7834cbf79a3617216 /indra/newview/llstatusbar.cpp | |
parent | d6ea42984553b7adb6f26cf2ed094d32e36814d2 (diff) | |
parent | f682c996d28c3841b6709f8fc67ba443bfcd1926 (diff) |
Merge
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* ) |