diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2009-11-30 16:03:38 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-30 16:03:38 -0800 |
| commit | b6f3692c28ee3c96b1feeb6f6e023448dab5fa23 (patch) | |
| tree | 36237042e3ff8077f0c96b4302bfb5a23b4f8096 /indra/newview/llstatusbar.h | |
| parent | 8e3276ebf9fc87b3d622dd23dbf22b10ffb494f2 (diff) | |
| parent | b9de2b2572f20e441fff4a0c4e757d409eac32d4 (diff) | |
Automated merge with ssh://rick@hg.lindenlab.com/skolb/media/
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; |