summaryrefslogtreecommitdiff
path: root/indra/newview/llstatusbar.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-10-20 12:18:33 -0400
committerLoren Shih <seraph@lindenlab.com>2010-10-20 12:18:33 -0400
commit76876538715e3afbe456e2bf84173bde416d50e6 (patch)
tree423b27e9a5ef5c463b066b0fb5a50bda25060869 /indra/newview/llstatusbar.cpp
parent0682e10532e058462d2bb1d5379c55d0e4d757e9 (diff)
parent04425000ae60b1fccf4feac1d4d84796d3b6b27d (diff)
Automated merge up from viewer-development
Diffstat (limited to 'indra/newview/llstatusbar.cpp')
-rw-r--r--indra/newview/llstatusbar.cpp8
1 files changed, 0 insertions, 8 deletions
diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp
index c3e4775fe1..e9fc25404a 100644
--- a/indra/newview/llstatusbar.cpp
+++ b/indra/newview/llstatusbar.cpp
@@ -217,8 +217,6 @@ BOOL LLStatusBar::postBuild()
mSGPacketLoss->mPerSec = FALSE;
addChild(mSGPacketLoss);
- getChild<LLTextBox>("stat_btn")->setClickedCallback(onClickStatGraph);
-
mPanelVolumePulldown = new LLPanelVolumePulldown();
addChild(mPanelVolumePulldown);
mPanelVolumePulldown->setFollows(FOLLOWS_TOP|FOLLOWS_RIGHT);
@@ -516,12 +514,6 @@ void LLStatusBar::onClickMediaToggle(void* data)
LLViewerMedia::setAllMediaEnabled(enable);
}
-// static
-void LLStatusBar::onClickStatGraph(void* data)
-{
- LLFloaterReg::showInstance("lagmeter");
-}
-
BOOL can_afford_transaction(S32 cost)
{
return((cost <= 0)||((gStatusBar) && (gStatusBar->getBalance() >=cost)));