summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatervoicedevicesettings.cpp
diff options
context:
space:
mode:
authorMark Palange (Mani) <palange@lindenlab.com>2009-11-09 13:16:18 -0800
committerMark Palange (Mani) <palange@lindenlab.com>2009-11-09 13:16:18 -0800
commitb34b82f7fea702b7cb4309195314c45fd3d2e630 (patch)
tree8af0d2b7f2670902d9b3d7cf878081ffd7aacab7 /indra/newview/llfloatervoicedevicesettings.cpp
parent06ba4927aa8d288b843ed1380132c14938708707 (diff)
parentdc5db676efd340bccd2c6f376c0bcba77e0507c4 (diff)
Automated merge with ssh://hg.lindenlab.com/brad/brad-parabuild
Diffstat (limited to 'indra/newview/llfloatervoicedevicesettings.cpp')
-rw-r--r--indra/newview/llfloatervoicedevicesettings.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llfloatervoicedevicesettings.cpp b/indra/newview/llfloatervoicedevicesettings.cpp
index bbeb287171..43024a4bd0 100644
--- a/indra/newview/llfloatervoicedevicesettings.cpp
+++ b/indra/newview/llfloatervoicedevicesettings.cpp
@@ -95,6 +95,9 @@ void LLPanelVoiceDeviceSettings::handleVisibilityChange ( BOOL new_visibility )
else
{
cleanup();
+ // when closing this window, turn of visiblity control so that
+ // next time preferences is opened we don't suspend voice
+ gSavedSettings.setBOOL("ShowDeviceSettings", FALSE);
}
}
void LLPanelVoiceDeviceSettings::draw()