From 6f66cdf7a1307ab37d7f07928fabbe7aa4ac2673 Mon Sep 17 00:00:00 2001
From: Leyla Farazha <leyla@lindenlab.com>
Date: Thu, 8 Oct 2009 00:31:01 +0000
Subject: EXT-1325 Texture Picker does not open EXT-1264 'Zoom in' world
 context menu opens IM session reviewed by Richard

---
 indra/newview/lltexturectrl.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'indra/newview/lltexturectrl.cpp')

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;
 }
 
-- 
cgit v1.2.3