diff options
| author | Logan Dethrow <log@lindenlab.com> | 2011-09-19 14:50:08 -0400 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2011-09-19 14:50:08 -0400 |
| commit | 5b7b3cbbbbec439880a33af8944d10c7bb527c3a (patch) | |
| tree | 3e37afeba3e2bb67f53327719de72b4506d2605e /indra/newview/llstatusbar.h | |
| parent | c7dd3aac83eb9bde5fe0febaebcd998847bf1889 (diff) | |
| parent | 2fba01d160716b886a7dfc0c86abda767a25d23f (diff) | |
Merge
Diffstat (limited to 'indra/newview/llstatusbar.h')
| -rw-r--r-- | indra/newview/llstatusbar.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llstatusbar.h b/indra/newview/llstatusbar.h index e1e1f5459b..6feeab393b 100644 --- a/indra/newview/llstatusbar.h +++ b/indra/newview/llstatusbar.h @@ -92,8 +92,8 @@ private: void onMouseEnterVolume(); void onMouseEnterNearbyMedia(); void onClickScreen(S32 x, S32 y); - void onModeChange(const LLSD& original_value, const LLSD& new_value);
- void onModeChangeConfirm(const LLSD& original_value, const LLSD& new_value, const LLSD& notification, const LLSD& response);
+ void onModeChange(const LLSD& original_value, const LLSD& new_value); + void onModeChangeConfirm(const LLSD& original_value, const LLSD& new_value, const LLSD& notification, const LLSD& response); static void onClickMediaToggle(void* data); static void onClickBalance(void* data); |