summaryrefslogtreecommitdiff
path: root/indra/newview/llstatusbar.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-01-04 16:45:08 -0500
committerOz Linden <oz@lindenlab.com>2011-01-04 16:45:08 -0500
commit78895f9e0c628dc33268578faf135e967cf30142 (patch)
tree6bca9250bf59591dce7636de42efe3cf293a232f /indra/newview/llstatusbar.h
parent09c7d38166e3f5d04ed6321b2ac06c4112bb858b (diff)
parent562ed9c4d463ccb96dd4e6b23dff6ad6c845fc96 (diff)
merge changes for storm-467
Diffstat (limited to 'indra/newview/llstatusbar.h')
-rw-r--r--indra/newview/llstatusbar.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llstatusbar.h b/indra/newview/llstatusbar.h
index 2388aeb0c8..4ea3183d18 100644
--- a/indra/newview/llstatusbar.h
+++ b/indra/newview/llstatusbar.h
@@ -94,6 +94,7 @@ private:
void onClickScreen(S32 x, S32 y);
static void onClickMediaToggle(void* data);
+ static void onClickBalance(void* data);
private:
LLTextBox *mTextTime;
@@ -102,6 +103,7 @@ private:
LLStatGraph *mSGPacketLoss;
LLButton *mBtnVolume;
+ LLTextBox *mBoxBalance;
LLButton *mMediaToggle;
LLView* mScriptOut;
LLFrameTimer mClockUpdateTimer;