diff options
author | Oz Linden <oz@lindenlab.com> | 2011-04-02 07:07:49 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-04-02 07:07:49 -0400 |
commit | e58c809a5816383674d0f1957440fad728e88893 (patch) | |
tree | 83f1ff2c4bee8237c4557793143b2133623943a4 /indra/newview/llstatusbar.h | |
parent | f9af1f4fca028709b0262c0e8c40eefc2ab13d00 (diff) | |
parent | e6c0615b97019cf9c8aee267513757c0c2510420 (diff) |
merge changes for STORM-1131
Diffstat (limited to 'indra/newview/llstatusbar.h')
-rw-r--r-- | indra/newview/llstatusbar.h | 2 |
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; |