diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-08-15 21:34:06 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-08-15 21:34:06 +0100 |
| commit | c5b0d4ccd074b7062e5100c3b021da53170eb30c (patch) | |
| tree | 6600bff8fd4d7f8af3f8d7929c511fbe3d6dc533 /indra/newview/llsettingspicker.cpp | |
| parent | ec0fe8078c1f64c1579f382a686282ddbb82f470 (diff) | |
| parent | f028ddd0754d5a2fd2f2300aa02eff4fe6cfa96f (diff) | |
Merge
Diffstat (limited to 'indra/newview/llsettingspicker.cpp')
| -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); |