diff options
author | callum <none@none> | 2010-10-04 17:40:59 -0700 |
---|---|---|
committer | callum <none@none> | 2010-10-04 17:40:59 -0700 |
commit | 21c8dea4e460939aae0767e791f3efed03dc91b3 (patch) | |
tree | fee1d569617bbe97a2e492a73deae7383da65868 /indra/newview/llstatusbar.cpp | |
parent | 89efb318141bb504597e525f186ea1a43502eac4 (diff) | |
parent | 7af6d1c7319bc0f339e9159161c05ed6eb45fb5b (diff) |
Test merge
Diffstat (limited to 'indra/newview/llstatusbar.cpp')
-rw-r--r-- | indra/newview/llstatusbar.cpp | 8 |
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))); |