diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-08-15 18:59:58 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-08-15 18:59:58 +0000 |
| commit | f028ddd0754d5a2fd2f2300aa02eff4fe6cfa96f (patch) | |
| tree | 15cf06210127945d2a037c240cf07afac2c27aa2 /indra | |
| parent | 7f71083f9e92339ac69e26b6c3dbf8d7556b07f8 (diff) | |
| parent | c858343af51a1223516026b90bdc4adc2d7f7860 (diff) | |
Merged in andreykproductengine/maint-eep (pull request #49)
MAINT-8996 EEP - fixed Settings picker is empty sometimes
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llsettingspicker.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llsettingspicker.cpp b/indra/newview/llsettingspicker.cpp index b386243777..e1a3269c5d 100644 --- 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); |