diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-04-18 20:39:18 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-04-18 20:39:18 +0300 |
| commit | 65ea8e1351c548b650eea4bd2ddef02b853c933d (patch) | |
| tree | 71f06c51e20e4818a66d200e170f5d6f42a8b17c /indra/newview/llfloaterpreference.cpp | |
| parent | 3fb9993a4a74c19b872bb96ed4878cd7b7143208 (diff) | |
| parent | d031662435d97101411ae990ed85d6e001ab668a (diff) | |
Merge branch 'master' into DRTVWR-483
Diffstat (limited to 'indra/newview/llfloaterpreference.cpp')
| -rw-r--r-- | indra/newview/llfloaterpreference.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 1fc734ae39..9064a65d05 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -2399,7 +2399,16 @@ void LLPanelPreference::saveSettings() { view_stack.push_back(*iter); } - } + } + + if (LLStartUp::getStartupState() == STATE_STARTED) + { + LLControlVariable* control = gSavedPerAccountSettings.getControl("VoiceCallsFriendsOnly"); + if (control) + { + mSavedValues[control] = control->getValue(); + } + } } void LLPanelPreference::showMultipleViewersWarning(LLUICtrl* checkbox, const LLSD& value) |