Merged in andreykproductengine/maint-eep (pull request #49)

MAINT-8996 EEP - fixed Settings picker is empty sometimes
2018-08-15 18:59:58 +00:00 · 2018-08-15 18:59:58 +00:00 · f028ddd075
parent 7f71083f9e c858343af5
commit f028ddd075
1 changed files with 2 additions and 1 deletions
--- a/indra/newview/llsettingspicker.cpp
+++ b/indra/newview/llsettingspicker.cpp
@ -63,7 +63,8 @@ LLFloaterSettingsPicker::LLFloaterSettingsPicker(LLView * owner, LLUUID initial_
    mLabel(label),
    mActive(true),
    mContextConeOpacity(0.0f),
-    mSettingAssetID(initial_asset_id)
+    mSettingAssetID(initial_asset_id),
+    mImmediateFilterPermMask(PERM_NONE)
 {
    buildFromFile(FLOATER_DEFINITION_XML);
    setCanMinimize(FALSE);