diff options
| author | Kent Quirk <q@lindenlab.com> | 2009-01-05 18:59:12 +0000 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2009-01-05 18:59:12 +0000 |
| commit | 667ca55bad0108c4bdf8f007b89e1a52fc766aad (patch) | |
| tree | 7bd62ac8d9af079c3994565f3f200ccc250bbc28 /indra/newview/lltoolbar.cpp | |
| parent | 95f365789f4cebc7bd97ccefd538f14d481a8373 (diff) | |
svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk.
Diffstat (limited to 'indra/newview/lltoolbar.cpp')
| -rw-r--r-- | indra/newview/lltoolbar.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
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(); } |