1 files changed, 13 insertions, 1 deletions

diff --git a/linden/indra/newview/lloverlaybar.cpp b/linden/indra/newview/lloverlaybar.cpp
index 9f3776f..6191a01 100644
--- a/linden/indra/newview/lloverlaybar.cpp
+++ b/linden/indra/newview/lloverlaybar.cpp
@@ -37,6 +37,7 @@
 
 #include "lloverlaybar.h"
 
+#include "aoremotectrl.h"
 #include "audioengine.h"
 #include "llrender.h"
 #include "llagent.h"
@@ -148,6 +149,13 @@ void* LLOverlayBar::createWindlightRemote(void* userdata)
         return self->mWindlightRemote;
 }
 
+void* LLOverlayBar::createAORemote(void* userdata)
+{
+        LLOverlayBar *self = (LLOverlayBar*)userdata;   
+        self->mAORemote = new AORemoteCtrl();
+        return self->mAORemote;
+}
+
 void* LLOverlayBar::createChatBar(void* userdata)
 {
         gChatBar = new LLChatBar();
@@ -159,6 +167,7 @@ LLOverlayBar::LLOverlayBar()
                 mMediaRemote(NULL),
                 mVoiceRemote(NULL),
                 mWindlightRemote(NULL),
+                mAORemote(NULL),
                 mMusicState(STOPPED),
                 mOriginalIMLabel("")
 {
@@ -171,6 +180,7 @@ LLOverlayBar::LLOverlayBar()
         factory_map["media_remote"] = LLCallbackMap(LLOverlayBar::createMediaRemote, this);
         factory_map["voice_remote"] = LLCallbackMap(LLOverlayBar::createVoiceRemote, this);
         factory_map["windlight_remote"] = LLCallbackMap(LLOverlayBar::createWindlightRemote, this);
+        factory_map["ao_remote"] = LLCallbackMap(LLOverlayBar::createAORemote, this);
         factory_map["chat_bar"] = LLCallbackMap(LLOverlayBar::createChatBar, this);
         
         LLUICtrlFactory::getInstance()->buildPanel(this, "panel_overlaybar.xml", &factory_map);
@@ -330,7 +340,7 @@ void LLOverlayBar::refresh()
                 buttons_changed = TRUE;
         }
 
-
+        moveChildToBackOfTabGroup(mAORemote);
         moveChildToBackOfTabGroup(mWindlightRemote);
         moveChildToBackOfTabGroup(mMediaRemote);
         moveChildToBackOfTabGroup(mVoiceRemote);
@@ -341,6 +351,7 @@ void LLOverlayBar::refresh()
                 childSetVisible("media_remote_container", FALSE);
                 childSetVisible("voice_remote_container", FALSE);
                 childSetVisible("windlight_remote_container", FALSE);
+                childSetVisible("ao_remote_container", FALSE);
                 childSetVisible("state_buttons", FALSE);
         }
         else
@@ -349,6 +360,7 @@ void LLOverlayBar::refresh()
                 childSetVisible("media_remote_container", TRUE);
                 childSetVisible("voice_remote_container", LLVoiceClient::voiceEnabled());
                 childSetVisible("windlight_remote_container", gSavedSettings.getBOOL("EnableWindlightRemote"));
+                childSetVisible("ao_remote_container", gSavedSettings.getBOOL("EnableAORemote"));
                 childSetVisible("state_buttons", TRUE);
         }