diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2009-10-08 00:31:01 +0000 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2009-10-08 00:31:01 +0000 |
| commit | 6f66cdf7a1307ab37d7f07928fabbe7aa4ac2673 (patch) | |
| tree | 9dfcf4091996a846b6a622b9826bc283e754f62b /indra/newview/lltexturectrl.cpp | |
| parent | 3a6a18ee30425bf1000f82b0a4b245c23f0deafc (diff) | |
EXT-1325 Texture Picker does not open
EXT-1264 'Zoom in' world context menu opens IM session
reviewed by Richard
Diffstat (limited to 'indra/newview/lltexturectrl.cpp')
| -rw-r--r-- | indra/newview/lltexturectrl.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index 43f82e592b..b5aec1b80b 100644 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -1066,15 +1066,17 @@ BOOL LLTextureCtrl::handleHover(S32 x, S32 y, MASK mask) BOOL LLTextureCtrl::handleMouseDown(S32 x, S32 y, MASK mask) { BOOL handled = LLUICtrl::handleMouseDown( x, y , mask ); - if( handled ) + + if( !handled ) { showPicker(FALSE); - //grab textures first... gInventory.startBackgroundFetch(gInventory.findCategoryUUIDForType(LLAssetType::AT_TEXTURE)); //...then start full inventory fetch. gInventory.startBackgroundFetch(); + handled = TRUE; } + return handled; } |