summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelgroup.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-07-30 10:01:53 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-07-30 10:01:53 +0100
commit78c84f86f8c07ca448b24b7df2c29d57eafd0643 (patch)
treeffb78d0abcc13533185749be5272713afda44265 /indra/newview/llpanelgroup.cpp
parentfd81ed9de7b3e97ab1cec2e58190ee5deb7a4a65 (diff)
parent7fcca83169287b5011b5b5a0193456e9a789619c (diff)
merge from PE's viewer-trunk
Diffstat (limited to 'indra/newview/llpanelgroup.cpp')
-rw-r--r--indra/newview/llpanelgroup.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llpanelgroup.cpp b/indra/newview/llpanelgroup.cpp
index 2fc74e138b..c383d04940 100644
--- a/indra/newview/llpanelgroup.cpp
+++ b/indra/newview/llpanelgroup.cpp
@@ -545,6 +545,7 @@ void LLPanelGroup::draw()
{
mRefreshTimer.stop();
childEnable("btn_refresh");
+ childEnable("groups_accordion");
}
LLButton* button_apply = findChild<LLButton>("btn_apply");
@@ -573,6 +574,8 @@ void LLPanelGroup::refreshData()
// 5 second timeout
childDisable("btn_refresh");
+ childDisable("groups_accordion");
+
mRefreshTimer.start();
mRefreshTimer.setTimerExpirySec(5);
}