1 files changed, 5 insertions, 27 deletions

diff --git a/linden/indra/newview/lltoolbar.cpp b/linden/indra/newview/lltoolbar.cpp
index 6d04294..cc6d4b8 100644
--- a/linden/indra/newview/lltoolbar.cpp
+++ b/linden/indra/newview/lltoolbar.cpp
@@ -18,7 +18,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -127,9 +128,6 @@ BOOL LLToolBar::postBuild()
         childSetAction("appearance_btn", onClickAppearance, this);
         childSetControlName("appearance_btn", "");
 
-        childSetAction("clothing_btn", onClickClothing, this);
-        childSetControlName("clothing_btn", "ClothingBtnState");
-
         childSetAction("fly_btn", onClickFly, this);
         childSetControlName("fly_btn", "FlyBtnState");
 
@@ -286,8 +284,6 @@ void LLToolBar::refresh()
         BOOL mouselook = gAgent.cameraMouselook();
         setVisible(show && !mouselook);
 
-        // Clothing button updated inside LLFloaterClothing
-
         BOOL sitting = FALSE;
         if (gAgent.getAvatarObject())
         {
@@ -307,21 +303,10 @@ void LLToolBar::refresh()
         }
         gSavedSettings.setBOOL("BuildBtnState", build_mode);
 
-// [RLVa:KB] - Version: 1.22.11 | Checked: 2009-07-10 (RLVa-1.0.0g)
-        // Called per-frame so this really can't be slow
-        if (rlv_handler_t::isEnabled())
+        if (isInVisibleChain())
         {
-                // If we're rez-restricted, we can still edit => allow build floater
-                // If we're edit-restricted, we can still rez => allow build floater
-                childSetEnabled("build_btn", !(gRlvHandler.hasBehaviour(RLV_BHVR_REZ) && gRlvHandler.hasBehaviour(RLV_BHVR_EDIT)) );
-
-                childSetEnabled("map_btn", !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWWORLDMAP) );
-                childSetEnabled("radar_btn", !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWMINIMAP) );
-                childSetEnabled("inventory_btn", !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWINV) );
+                updateCommunicateList();
         }
-// [/RLVa:KB]
-
-        updateCommunicateList();
 }
 
 void LLToolBar::updateCommunicateList()
@@ -458,7 +443,7 @@ void LLToolBar::onClickChat(void* user_data)
 // static
 void LLToolBar::onClickAppearance(void*)
 {
-        if (gAgent.getWearablesLoaded())
+        if (gAgent.areWearablesLoaded())
         {
                 gAgent.changeCameraToCustomizeAvatar();
         }
@@ -466,13 +451,6 @@ void LLToolBar::onClickAppearance(void*)
 
 
 // static
-void LLToolBar::onClickClothing(void*)
-{
-        handle_clothing(NULL);
-}
-
-
-// static
 void LLToolBar::onClickFly(void*)
 {
         gAgent.toggleFlying();