diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-06-21 18:40:18 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-06-21 18:40:18 +0100 |
| commit | 2c0583a2719faabd32415782e2326858e0557d0e (patch) | |
| tree | 50a5845ebd39fba7bb428d145404de85ed30e499 /indra/newview/lltexturectrl.cpp | |
| parent | 91121d113d25af570ec64564dd10c21f0d5fcb69 (diff) | |
| parent | ea75559674a8ac6d48fbf511880b1a79cbb7642d (diff) | |
Merge 5.1.7
Diffstat (limited to 'indra/newview/lltexturectrl.cpp')
| -rw-r--r-- | indra/newview/lltexturectrl.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index c7adaa908f..a5a2eec246 100644 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -990,6 +990,7 @@ LLTextureCtrl::LLTextureCtrl(const LLTextureCtrl::Params& p) mOnSelectCallback(NULL), mBorderColor( p.border_color() ), mAllowNoTexture( FALSE ), + mAllowLocalTexture( TRUE ), mImmediateFilterPermMask( PERM_NONE ), mNonImmediateFilterPermMask( PERM_NONE ), mCanApplyImmediately( FALSE ), @@ -1198,6 +1199,12 @@ void LLTextureCtrl::showPicker(BOOL take_focus) floaterp->openFloater(); } + LLFloaterTexturePicker* picker_floater = dynamic_cast<LLFloaterTexturePicker*>(floaterp); + if (picker_floater) + { + picker_floater->setLocalTextureEnabled(mAllowLocalTexture); + } + if (take_focus) { floaterp->setFocus(TRUE); |