diff options
author | McCabe Maxsted | 2009-09-10 21:43:11 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-09-10 21:43:11 -0700 |
commit | f332eaa4a69a4546e0b9b2ba3719e3c038731fd3 (patch) | |
tree | 69a2c79196b7a7cffa49b861329e65b2c5ba7ddf /linden/indra/newview/lloverlaybar.h | |
parent | Admin options now only show for other people's profiles (diff) | |
download | meta-impy-f332eaa4a69a4546e0b9b2ba3719e3c038731fd3.zip meta-impy-f332eaa4a69a4546e0b9b2ba3719e3c038731fd3.tar.gz meta-impy-f332eaa4a69a4546e0b9b2ba3719e3c038731fd3.tar.bz2 meta-impy-f332eaa4a69a4546e0b9b2ba3719e3c038731fd3.tar.xz |
Created new toolbar control for windlight presets and options
Diffstat (limited to 'linden/indra/newview/lloverlaybar.h')
-rw-r--r-- | linden/indra/newview/lloverlaybar.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/linden/indra/newview/lloverlaybar.h b/linden/indra/newview/lloverlaybar.h index 52a469a..140fabf 100644 --- a/linden/indra/newview/lloverlaybar.h +++ b/linden/indra/newview/lloverlaybar.h | |||
@@ -40,6 +40,7 @@ extern S32 STATUS_BAR_HEIGHT; | |||
40 | class LLButton; | 40 | class LLButton; |
41 | class LLLineEditor; | 41 | class LLLineEditor; |
42 | class LLMediaRemoteCtrl; | 42 | class LLMediaRemoteCtrl; |
43 | |||
43 | class LLMessageSystem; | 44 | class LLMessageSystem; |
44 | class LLTextBox; | 45 | class LLTextBox; |
45 | class LLTextEditor; | 46 | class LLTextEditor; |
@@ -49,6 +50,7 @@ class LLFrameTimer; | |||
49 | class LLStatGraph; | 50 | class LLStatGraph; |
50 | class LLSlider; | 51 | class LLSlider; |
51 | class LLVoiceRemoteCtrl; | 52 | class LLVoiceRemoteCtrl; |
53 | class LLWindlightRemoteCtrl; | ||
52 | 54 | ||
53 | class LLOverlayBar | 55 | class LLOverlayBar |
54 | : public LLPanel | 56 | : public LLPanel |
@@ -88,13 +90,15 @@ public: | |||
88 | protected: | 90 | protected: |
89 | static void* createMediaRemote(void* userdata); | 91 | static void* createMediaRemote(void* userdata); |
90 | static void* createVoiceRemote(void* userdata); | 92 | static void* createVoiceRemote(void* userdata); |
93 | static void* createWindlightRemote(void* userdata); | ||
91 | static void* createChatBar(void* userdata); | 94 | static void* createChatBar(void* userdata); |
92 | 95 | ||
93 | void enableMediaButtons(); | 96 | void enableMediaButtons(); |
94 | 97 | ||
95 | protected: | 98 | protected: |
96 | LLMediaRemoteCtrl* mMediaRemote; | 99 | LLMediaRemoteCtrl* mMediaRemote; |
97 | LLVoiceRemoteCtrl* mVoiceRemote; | 100 | LLVoiceRemoteCtrl* mVoiceRemote; |
101 | LLWindlightRemoteCtrl* mWindlightRemote; | ||
98 | bool mBuilt; // dialog constructed yet? | 102 | bool mBuilt; // dialog constructed yet? |
99 | S32 mMusicState; | 103 | S32 mMusicState; |
100 | std::string mOriginalIMLabel; | 104 | std::string mOriginalIMLabel; |