From 667ca55bad0108c4bdf8f007b89e1a52fc766aad Mon Sep 17 00:00:00 2001
From: Kent Quirk <q@lindenlab.com>
Date: Mon, 5 Jan 2009 18:59:12 +0000
Subject: svn merge -r106715:HEAD
 svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715
 .  QAR-1149 -- Final merge of notifications to trunk.

---
 indra/newview/lltoolbar.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'indra/newview/lltoolbar.cpp')

diff --git a/indra/newview/lltoolbar.cpp b/indra/newview/lltoolbar.cpp
index d7db0f85d9..b9235a489a 100644
--- a/indra/newview/lltoolbar.cpp
+++ b/indra/newview/lltoolbar.cpp
@@ -307,7 +307,10 @@ void LLToolBar::refresh()
 	}
 	gSavedSettings.setBOOL("BuildBtnState", build_mode);
 
-	updateCommunicateList();
+	if (isInVisibleChain())
+	{
+		updateCommunicateList();
+	}
 }
 
 void LLToolBar::updateCommunicateList()
@@ -444,7 +447,7 @@ void LLToolBar::onClickChat(void* user_data)
 // static
 void LLToolBar::onClickAppearance(void*)
 {
-	if (gAgent.getWearablesLoaded())
+	if (gAgent.areWearablesLoaded())
 	{
 		gAgent.changeCameraToCustomizeAvatar();
 	}
-- 
cgit v1.2.3