diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-06-15 20:35:30 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-06-15 20:37:23 +0300 |
| commit | b5d3a5b56ae4243d0f442a1e700dacbdab0a9beb (patch) | |
| tree | 1f55413246da2e94ec84887b1a829908895c133f /indra/newview | |
| parent | d358cca943f48a443e89630944383cb049ad9ef1 (diff) | |
SL-15353 'Cancel' button does not cancel 'Only friends and groups can call or IM me'
Diffstat (limited to 'indra/newview')
| -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 6bf2136f60..5db2c0cb9d 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -2406,7 +2406,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) |