diff options
| author | Oz Linden <oz@lindenlab.com> | 2018-06-21 15:31:21 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2018-06-21 15:31:21 -0400 |
| commit | 3cdce9bf24ebac1c48b30955910a8f6b36797cb5 (patch) | |
| tree | 5f731c4237dfe544e475c7d5f119aa2c6e8edcb8 /indra/newview/lltexturectrl.cpp | |
| parent | c0e00cc61750d2b1bba3ada6622023df4725b1a4 (diff) | |
| parent | dc07de2f4a4c49d1877bf743b6f0d209392f6eb6 (diff) | |
merge changes for 5.1.6-release
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); |