diff options
| author | callum <none@none> | 2009-11-30 17:14:37 -0800 |
|---|---|---|
| committer | callum <none@none> | 2009-11-30 17:14:37 -0800 |
| commit | 532a8ed0567878737cfc41ec516dbd1dec76003d (patch) | |
| tree | 622f767dff948bd97b72ac4dbdf722a068d7531b /indra/newview/llstatusbar.h | |
| parent | d90aea0ede0fc6958d6f323a0eae4079f14c46f2 (diff) | |
| parent | 948af3093c93461d11ab6a76a8aab7ea10e377c6 (diff) | |
Merge with tip
Diffstat (limited to 'indra/newview/llstatusbar.h')
| -rw-r--r-- | indra/newview/llstatusbar.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llstatusbar.h b/indra/newview/llstatusbar.h index bdaacce981..f77cc1acb8 100644 --- a/indra/newview/llstatusbar.h +++ b/indra/newview/llstatusbar.h @@ -47,6 +47,7 @@ class LLUICtrl; class LLUUID; class LLFrameTimer; class LLStatGraph; +class LLPanelVolumePulldown; class LLStatusBar : public LLPanel @@ -92,8 +93,8 @@ private: void onVolumeChanged(const LLSD& newvalue); + static void onMouseEnterVolume(LLUICtrl* ctrl); static void onClickStatGraph(void* data); - private: LLTextBox *mTextHealth; |