diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-01 16:43:39 +0200 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-12-01 16:43:39 +0200 |
commit | 3474fc42283a0891abb1f7c8f74677921a33690f (patch) | |
tree | 654050d93737bd66a405a0e97b60c5c50f5f5894 /indra/newview/llstatusbar.h | |
parent | 0699c41e7c951464f759f63f43f4dea2a85ba528 (diff) | |
parent | 8b75c2154985346317b56928276f875073d6d69f (diff) |
Merge from default branch.
--HG--
branch : product-engine
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; |