Merge branch 'master' into DRTVWR-528

1 files changed, 13 insertions, 1 deletions

diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp
index da01457126..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)
@@ -2945,6 +2954,9 @@ void LLPanelPreferenceControls::populateControlTable()
         LL_WARNS() << "Unimplemented mode" << LL_ENDL;
     }
 
+    // explicit update to make sure table is ready for llsearchableui
+    pControlsTable->updateColumns();
+
     // Searchable columns were removed and readded, mark searchables for an update
     // Note: at the moment tables/lists lack proper llsearchableui support
     LLFloaterPreference* instance = LLFloaterReg::findTypedInstance<LLFloaterPreference>("preferences");