diff options
author | Rick Pasetto <rick@lindenlab.com> | 2010-07-30 17:33:50 -0700 |
---|---|---|
committer | Rick Pasetto <rick@lindenlab.com> | 2010-07-30 17:33:50 -0700 |
commit | 08f13801d2a10897e807c9bac6b9c902560527fe (patch) | |
tree | cd968f99ce101bc40990baa8b5e3652b79c1bc6f | |
parent | e56a0dfd28bf03a9c2e93cb639562621e8d5cdf6 (diff) | |
parent | 52a39060c717fcbfd1c44f21009a5d0d5878944d (diff) |
Automated merge with ssh://richard@hg.lindenlab.com/dessie/viewer-public
-rw-r--r-- | indra/newview/llstatusbar.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp index 213925ecdf..a6bb4d4d5f 100644 --- a/indra/newview/llstatusbar.cpp +++ b/indra/newview/llstatusbar.cpp @@ -111,8 +111,6 @@ const F32 ICON_TIMER_EXPIRY = 3.f; // How long the balance and health icons sho const F32 ICON_FLASH_FREQUENCY = 2.f; const S32 TEXT_HEIGHT = 18; -static void onClickHealth(void*); -static void onClickScriptDebug(void*); static void onClickVolume(void*); std::vector<std::string> LLStatusBar::sDays; @@ -464,16 +462,6 @@ void LLStatusBar::onClickBuyCurrency() LLBuyCurrencyHTML::openCurrencyFloater(); } -static void onClickHealth(void* ) -{ - LLNotificationsUtil::add("NotSafe"); -} - -static void onClickScriptDebug(void*) -{ - LLFloaterScriptDebug::show(LLUUID::null); -} - void LLStatusBar::onMouseEnterVolume() { LLButton* volbtn = getChild<LLButton>( "volume_btn" ); |