diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-08-15 13:37:54 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-08-15 13:37:54 -0700 |
| commit | d4aa55eade93a451149f906fe9187235306e8343 (patch) | |
| tree | 88a726175a8de7efb4d7d3e6e006c75b458a003f /indra/newview/llsettingspicker.cpp | |
| parent | eadf0b910174274e7c83fe37e417f576a7350edb (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 fedd3f387c..c882e7dbbb 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); |