diff options
author | Jacek Antonelli | 2008-08-15 23:45:16 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:16 -0500 |
commit | 3f27ba891ac4d032753b219b4b96d1ffbc9fb488 (patch) | |
tree | 504932ee91a0356fba7ea48798887c96867e492f /linden/indra/newview/lloverlaybar.h | |
parent | Second Life viewer sources 1.18.4.3 (diff) | |
download | meta-impy-3f27ba891ac4d032753b219b4b96d1ffbc9fb488.zip meta-impy-3f27ba891ac4d032753b219b4b96d1ffbc9fb488.tar.gz meta-impy-3f27ba891ac4d032753b219b4b96d1ffbc9fb488.tar.bz2 meta-impy-3f27ba891ac4d032753b219b4b96d1ffbc9fb488.tar.xz |
Second Life viewer sources 1.18.5.0-RC
Diffstat (limited to 'linden/indra/newview/lloverlaybar.h')
-rw-r--r-- | linden/indra/newview/lloverlaybar.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/lloverlaybar.h b/linden/indra/newview/lloverlaybar.h index d8b9ba1..2293463 100644 --- a/linden/indra/newview/lloverlaybar.h +++ b/linden/indra/newview/lloverlaybar.h | |||
@@ -33,13 +33,13 @@ | |||
33 | #define LL_LLOVERLAYBAR_H | 33 | #define LL_LLOVERLAYBAR_H |
34 | 34 | ||
35 | #include "llpanel.h" | 35 | #include "llpanel.h" |
36 | #include "llmediaremotectrl.h" | ||
37 | 36 | ||
38 | // "Constants" loaded from settings.xml at start time | 37 | // "Constants" loaded from settings.xml at start time |
39 | extern S32 STATUS_BAR_HEIGHT; | 38 | extern S32 STATUS_BAR_HEIGHT; |
40 | 39 | ||
41 | class LLButton; | 40 | class LLButton; |
42 | class LLLineEditor; | 41 | class LLLineEditor; |
42 | class LLMediaRemoteCtrl; | ||
43 | class LLMessageSystem; | 43 | class LLMessageSystem; |
44 | class LLTextBox; | 44 | class LLTextBox; |
45 | class LLTextEditor; | 45 | class LLTextEditor; |
@@ -102,7 +102,7 @@ protected: | |||
102 | LLMediaRemoteCtrl* mMusicRemote; | 102 | LLMediaRemoteCtrl* mMusicRemote; |
103 | LLMediaRemoteCtrl* mMediaRemote; | 103 | LLMediaRemoteCtrl* mMediaRemote; |
104 | LLVoiceRemoteCtrl* mVoiceRemote; | 104 | LLVoiceRemoteCtrl* mVoiceRemote; |
105 | BOOL isBuilt; | 105 | bool mBuilt; // dialog constructed yet? |
106 | enum { STOPPED=0, PLAYING=1, PAUSED=2 }; | 106 | enum { STOPPED=0, PLAYING=1, PAUSED=2 }; |
107 | BOOL mMediaState; | 107 | BOOL mMediaState; |
108 | BOOL mMusicState; | 108 | BOOL mMusicState; |