1 files changed, 24 insertions, 1 deletions

diff --git a/linden/indra/newview/lloverlaybar.cpp b/linden/indra/newview/lloverlaybar.cpp
index 91a7375..12c001e 100644
--- a/linden/indra/newview/lloverlaybar.cpp
+++ b/linden/indra/newview/lloverlaybar.cpp
@@ -62,6 +62,7 @@
 #include "llvoavatar.h"
 #include "llvoiceremotectrl.h"
 #include "llwebbrowserctrl.h"
+#include "llwindlightremotectrl.h"
 #include "llselectmgr.h"
 
 //
@@ -92,6 +93,13 @@ void* LLOverlayBar::createVoiceRemote(void* userdata)
         return self->mVoiceRemote;
 }
 
+void* LLOverlayBar::createWindlightRemote(void* userdata)
+{
+        LLOverlayBar *self = (LLOverlayBar*)userdata;   
+        self->mWindlightRemote = new LLWindlightRemoteCtrl();
+        return self->mWindlightRemote;
+}
+
 void* LLOverlayBar::createChatBar(void* userdata)
 {
         gChatBar = new LLChatBar();
@@ -102,6 +110,7 @@ LLOverlayBar::LLOverlayBar()
         :       LLPanel(),
                 mMediaRemote(NULL),
                 mVoiceRemote(NULL),
+                mWindlightRemote(NULL),
                 mMusicState(STOPPED),
                 mOriginalIMLabel("")
 {
@@ -113,6 +122,7 @@ LLOverlayBar::LLOverlayBar()
         LLCallbackMap::map_t factory_map;
         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["chat_bar"] = LLCallbackMap(LLOverlayBar::createChatBar, this);
         
         LLUICtrlFactory::getInstance()->buildPanel(this, "panel_overlaybar.xml", &factory_map);
@@ -256,7 +266,10 @@ void LLOverlayBar::refresh()
         BOOL sitting = FALSE;
         if (gAgent.getAvatarObject())
         {
-                sitting = gAgent.getAvatarObject()->mIsSitting;
+//              sitting = gAgent.getAvatarObject()->mIsSitting;
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
+                sitting = gAgent.getAvatarObject()->mIsSitting && !gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT);
+// [/RLVa:KB]
         }
         button = getChild<LLButton>("Stand Up");
 
@@ -269,6 +282,7 @@ void LLOverlayBar::refresh()
         }
 
 
+        moveChildToBackOfTabGroup(mWindlightRemote);
         moveChildToBackOfTabGroup(mMediaRemote);
         moveChildToBackOfTabGroup(mVoiceRemote);
 
@@ -277,6 +291,7 @@ void LLOverlayBar::refresh()
         {
                 childSetVisible("media_remote_container", FALSE);
                 childSetVisible("voice_remote_container", FALSE);
+                childSetVisible("windlight_remote_container", FALSE);
                 childSetVisible("state_buttons", FALSE);
         }
         else
@@ -284,6 +299,7 @@ void LLOverlayBar::refresh()
                 // update "remotes"
                 childSetVisible("media_remote_container", TRUE);
                 childSetVisible("voice_remote_container", LLVoiceClient::voiceEnabled());
+                childSetVisible("windlight_remote_container", gSavedSettings.getBOOL("EnableWindlightRemote"));
                 childSetVisible("state_buttons", TRUE);
         }
 
@@ -336,6 +352,13 @@ void LLOverlayBar::onClickMouselook(void*)
 //static
 void LLOverlayBar::onClickStandUp(void*)
 {
+// [RLVa:KB] - Checked: 2009-07-10 (RLVa-1.0.0g)
+        if ( (gRlvHandler.hasBehaviour(RLV_BHVR_UNSIT)) && (gAgent.getAvatarObject()) && (gAgent.getAvatarObject()->mIsSitting) )
+        {
+                return;
+        }
+// [/RLVa:KB]
+
         LLSelectMgr::getInstance()->deselectAllForStandingUp();
         gAgent.setControlFlags(AGENT_CONTROL_STAND_UP);
 }