From 54c87e94732e783314b7abbf60824dba8d00d8cd Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Thu, 26 May 2011 04:13:12 -0500 Subject: Better behavior for disabled texture_picker (LLTextureCtrl) widgets. Before, a disabled texture_picker widget would still open a floater when clicked, change the mouse cursor on hover, and accept drag-and-drops. Now, it actually behaves in a disabled way. --- linden/indra/newview/lltexturectrl.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/linden/indra/newview/lltexturectrl.cpp b/linden/indra/newview/lltexturectrl.cpp index ccc3ab2..e58b0b4 100644 --- a/linden/indra/newview/lltexturectrl.cpp +++ b/linden/indra/newview/lltexturectrl.cpp @@ -1304,6 +1304,7 @@ public: BOOL LLTextureCtrl::handleHover(S32 x, S32 y, MASK mask) { + if (!getEnabled()) { return FALSE; } getWindow()->setCursor(UI_CURSOR_HAND); return TRUE; } @@ -1311,6 +1312,7 @@ BOOL LLTextureCtrl::handleHover(S32 x, S32 y, MASK mask) BOOL LLTextureCtrl::handleMouseDown(S32 x, S32 y, MASK mask) { + if (!getEnabled()) { return FALSE; } BOOL handled = LLUICtrl::handleMouseDown( x, y , mask ); if( handled ) { @@ -1421,6 +1423,8 @@ BOOL LLTextureCtrl::handleDragAndDrop(S32 x, S32 y, MASK mask, EAcceptance *accept, std::string& tooltip_msg) { + if (!getEnabled()) { return FALSE; } + BOOL handled = FALSE; // this downcast may be invalid - but if the second test below -- cgit v1.1 From 82507059ee320ccb4762e70e1764dbc109b015ea Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Thu, 26 May 2011 04:13:41 -0500 Subject: Disabled the texture_picker in "Local Texture Properties". (IMP-476) Before, the texture_picker widget in the "Local Texture Properties" floater was interactive, even though using it had no effect. Now it is disabled (noninteractive), to avoid misleading or confusing the user. --- linden/indra/newview/floaterlocalassetbrowse.cpp | 2 +- .../newview/skins/default/xui/en-us/floater_local_asset_browse.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/linden/indra/newview/floaterlocalassetbrowse.cpp b/linden/indra/newview/floaterlocalassetbrowse.cpp index 8ea13cc..8633ac4 100644 --- a/linden/indra/newview/floaterlocalassetbrowse.cpp +++ b/linden/indra/newview/floaterlocalassetbrowse.cpp @@ -943,7 +943,7 @@ void FloaterLocalAssetBrowser::UpdateRightSide() sLFInstance->mLinkTxt->setText( unit->getLinkStatus() ); sLFInstance->mTypeComboBox->selectNthItem( unit->getType() ); - sLFInstance->mTextureView->setEnabled(true); + sLFInstance->mTextureView->setEnabled(false); sLFInstance->mUpdateChkBox->setEnabled(true); sLFInstance->mTypeComboBox->setEnabled(true); } diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_local_asset_browse.xml b/linden/indra/newview/skins/default/xui/en-us/floater_local_asset_browse.xml index f9bb3a7..a8ce59c 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_local_asset_browse.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_local_asset_browse.xml @@ -118,12 +118,12 @@ default_image_name="Default" can_apply_immediately="true" follows="left|top" - label="Texture" bottom_delta="20" left_delta="0" mouse_opaque="true" name="texture_view" visible="true" + enabled="false" />