diff options
Diffstat (limited to 'indra/newview/lltexturectrl.cpp')
| -rw-r--r-- | indra/newview/lltexturectrl.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index 1396a8546d..39a7e81184 100644 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -1096,10 +1096,6 @@ void LLTextureCtrl::setVisible( BOOL visible ) void LLTextureCtrl::setEnabled( BOOL enabled ) { LLFloaterTexturePicker* floaterp = (LLFloaterTexturePicker*)mFloaterHandle.get(); - if( floaterp ) - { - floaterp->setActive(enabled); - } if( enabled ) { std::string tooltip; @@ -1114,6 +1110,11 @@ void LLTextureCtrl::setEnabled( BOOL enabled ) closeDependentFloater(); } + if( floaterp ) + { + floaterp->setActive(enabled); + } + mCaption->setEnabled( enabled ); LLView::setEnabled( enabled ); |