diff options
author | andreykproductengine <akleshchev@productengine.com> | 2015-02-27 14:11:53 +0200 |
---|---|---|
committer | andreykproductengine <akleshchev@productengine.com> | 2015-02-27 14:11:53 +0200 |
commit | 40dbdb9b38f9f9a1470c24ab0d98a96ad89cc686 (patch) | |
tree | 26e56a62e6347592319d3a8ea7a294e81d16c4cc /indra/newview/llfloaterpreference.cpp | |
parent | 6993f835e702fc41e01fe247427e795974edeb43 (diff) | |
parent | 9b45bc992edf8d049d8a1abe2e778870a493295a (diff) |
Merge viewer-release and become 3.7.26
Diffstat (limited to 'indra/newview/llfloaterpreference.cpp')
-rwxr-xr-x | indra/newview/llfloaterpreference.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index d3773767d0..598c7f9feb 100755 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -701,13 +701,13 @@ void LLFloaterPreference::onOpen(const LLSD& key) maturity_list->deleteItems(LLSD(SIM_ACCESS_ADULT)); } } - getChildView("maturity_desired_combobox")->setVisible( true); + getChildView("maturity_desired_combobox")->setEnabled( true); getChildView("maturity_desired_textbox")->setVisible( false); } else { getChild<LLUICtrl>("maturity_desired_textbox")->setValue(maturity_combo->getSelectedItemLabel()); - getChildView("maturity_desired_combobox")->setVisible( false); + getChildView("maturity_desired_combobox")->setEnabled( false); } // Forget previous language changes. @@ -2011,6 +2011,12 @@ void LLPanelPreference::cancel() { LLControlVariable* control = iter->first; LLSD ctrl_value = iter->second; + + if((control->getName() == "InstantMessageLogPath") && (ctrl_value.asString() == "")) + { + continue; + } + control->set(ctrl_value); } |