aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/lloverlaybar.h
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-06-15 01:03:29 -0700
committerJacek Antonelli2010-06-19 02:43:39 -0500
commit991aa9770f6b3d5922ec7a7a3e2e2fc999de61ab (patch)
tree8aa3e75288e5a5e11480f9d8bffdddb4eea84678 /linden/indra/newview/lloverlaybar.h
parentAutomatically try logging in again if 'Login Failed. You appear to be already... (diff)
downloadmeta-impy-991aa9770f6b3d5922ec7a7a3e2e2fc999de61ab.zip
meta-impy-991aa9770f6b3d5922ec7a7a3e2e2fc999de61ab.tar.gz
meta-impy-991aa9770f6b3d5922ec7a7a3e2e2fc999de61ab.tar.bz2
meta-impy-991aa9770f6b3d5922ec7a7a3e2e2fc999de61ab.tar.xz
Created toolbar remote for toggling AO on/off
Diffstat (limited to 'linden/indra/newview/lloverlaybar.h')
-rw-r--r--linden/indra/newview/lloverlaybar.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/linden/indra/newview/lloverlaybar.h b/linden/indra/newview/lloverlaybar.h
index 50ad3d1..233f5c5 100644
--- a/linden/indra/newview/lloverlaybar.h
+++ b/linden/indra/newview/lloverlaybar.h
@@ -52,6 +52,7 @@ class LLStatGraph;
52class LLSlider; 52class LLSlider;
53class LLVoiceRemoteCtrl; 53class LLVoiceRemoteCtrl;
54class LLWindlightRemoteCtrl; 54class LLWindlightRemoteCtrl;
55class AORemoteCtrl;
55 56
56class LLOverlayBar 57class LLOverlayBar
57: public LLPanel 58: public LLPanel
@@ -92,6 +93,7 @@ protected:
92 static void* createMediaRemote(void* userdata); 93 static void* createMediaRemote(void* userdata);
93 static void* createVoiceRemote(void* userdata); 94 static void* createVoiceRemote(void* userdata);
94 static void* createWindlightRemote(void* userdata); 95 static void* createWindlightRemote(void* userdata);
96 static void* createAORemote(void* userdata);
95 static void* createChatBar(void* userdata); 97 static void* createChatBar(void* userdata);
96 98
97 void enableMediaButtons(); 99 void enableMediaButtons();
@@ -100,6 +102,7 @@ protected:
100 LLMediaRemoteCtrl* mMediaRemote; 102 LLMediaRemoteCtrl* mMediaRemote;
101 LLVoiceRemoteCtrl* mVoiceRemote; 103 LLVoiceRemoteCtrl* mVoiceRemote;
102 LLWindlightRemoteCtrl* mWindlightRemote; 104 LLWindlightRemoteCtrl* mWindlightRemote;
105 AORemoteCtrl* mAORemote;
103 bool mBuilt; // dialog constructed yet? 106 bool mBuilt; // dialog constructed yet?
104 S32 mMusicState; 107 S32 mMusicState;
105 std::string mOriginalIMLabel; 108 std::string mOriginalIMLabel;