SL-19873 Clear gallery selection when right-clicking outside of selected items

1 files changed, 5 insertions, 5 deletions

diff --git a/indra/newview/llinventorygallery.cpp b/indra/newview/llinventorygallery.cpp
index c584def3eb..40c76a4b5f 100644
--- a/indra/newview/llinventorygallery.cpp
+++ b/indra/newview/llinventorygallery.cpp
@@ -936,13 +936,13 @@ void LLInventoryGallery::updateItemThumbnail(LLUUID item_id)
 
 BOOL LLInventoryGallery::handleRightMouseDown(S32 x, S32 y, MASK mask)
 {
-    LLUUID old_selection = mSelectedItemID;
-    BOOL res = LLPanel::handleRightMouseDown(x, y, mask);
-    if (!res)
+    if(mItemMap[mSelectedItemID])
     {
-        clearSelection();
-        mItemMap[old_selection]->setFocus(false);
+        mItemMap[mSelectedItemID]->setFocus(false);
+        setFocus(true);
     }
+    clearSelection();
+    BOOL res = LLPanel::handleRightMouseDown(x, y, mask);
 
     if (mSelectedItemID.isNull())
     {