summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2012-12-12 17:43:15 -0800
committerGilbert Gonzales <gilbert@lindenlab.com>2012-12-12 17:43:15 -0800
commit37e95e837968935fba1744ec59b3fdd32b7034bf (patch)
treef2f648abaac6fbf7a2f35c1255440d01caabca91 /indra
parent2a9056f0b74ad8dc3051488688e150a85cb0afdc (diff)
CHUI-545: Minor logic fix, inside ::switchIndicator(), make sure that in the case that the parent is visible and the parent makes the visibility changes...that mIndicatorToggled becomes false because the parent has already made the visiblity changes.
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/lloutputmonitorctrl.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/lloutputmonitorctrl.cpp b/indra/newview/lloutputmonitorctrl.cpp
index 88a52caf27..02841e9831 100644
--- a/indra/newview/lloutputmonitorctrl.cpp
+++ b/indra/newview/lloutputmonitorctrl.cpp
@@ -313,6 +313,8 @@ void LLOutputMonitorCtrl::switchIndicator(bool switch_on)
if (getParent() && getParent()->isInVisibleChain())
{
notifyParentVisibilityChanged();
+ //Ignore toggled state in case it was set when parent visibility was hidden
+ mIndicatorToggled = false;
}
else
{