diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-09-15 16:09:17 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-09-15 16:09:17 -0400 |
| commit | 92fa144dcea4cbb6426b895cf5359da0c90eb4ae (patch) | |
| tree | fc9f7dd3f875be8d50cc13050664b1f43ed0a93f /indra/newview/llstatusbar.h | |
| parent | 758b936deaa0e6ea397c49afa5024315415eeb93 (diff) | |
| parent | b2d20f5a989bde2c4db90091bec37d310cc346fc (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); |