From 3546b5777b82362951ac5119c5960eabc2f54c32 Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Sat, 2 Feb 2019 13:57:01 -0500 Subject: [PATCH] Oops, these are needed for the texture picker clicker --- indra/newview/lltexturectrl.cpp | 2 +- indra/newview/lltexturectrl.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index 5481c3c1f..890e81410 100644 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -1306,7 +1306,7 @@ void LLTextureCtrl::setEnabled( BOOL enabled ) mCaption->setEnabled( enabled ); mEnable = enabled; - LLView::setEnabled( enabled ); + //LLView::setEnabled( enabled ); // } void LLTextureCtrl::setValid(BOOL valid ) diff --git a/indra/newview/lltexturectrl.h b/indra/newview/lltexturectrl.h index 718aa1106..5d43dfdf0 100644 --- a/indra/newview/lltexturectrl.h +++ b/indra/newview/lltexturectrl.h @@ -150,6 +150,8 @@ public: void onFloaterCommit(ETexturePickOp op); void onFloaterCommit(ETexturePickOp op, LLUUID id); // tag: vaa emerald local_asset_browser + bool canChange() { return mEnable; } // + // This call is returned when a drag is detected. Your callback // should return TRUE if the drag is acceptable. void setDragCallback(drag_n_drop_callback cb) { mDragCallback = cb; }