SL-20040 Fix selection and context menu issues

1 files changed, 10 insertions, 10 deletions

diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index b63d6b9308..30f301027c 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -1750,7 +1750,7 @@ void LLPanelMainInventory::saveTexture(const LLSD& userdata)
     LLUUID item_id;
     if(mSingleFolderMode && isGalleryViewMode())
     {
-        item_id = mCombinationGalleryPanel->getSelectedItemID();
+        item_id = mCombinationGalleryPanel->getFirstSelectedItemID();
         if (item_id.isNull()) return;
     }
     else
@@ -1848,7 +1848,7 @@ void LLPanelMainInventory::onCustomAction(const LLSD& userdata)
 	{
         if(mSingleFolderMode && isGalleryViewMode())
         {
-            LLInventoryObject *obj = gInventory.getObject(mCombinationGalleryPanel->getSelectedItemID());
+            LLInventoryObject *obj = gInventory.getObject(mCombinationGalleryPanel->getFirstSelectedItemID());
             if (obj && obj->getIsLinkType())
             {
                 show_item_original(obj->getUUID());
@@ -1878,7 +1878,7 @@ void LLPanelMainInventory::onCustomAction(const LLSD& userdata)
                     LLPanelMainInventory* main_inventory = sidepanel_inventory->getMainInventoryPanel();
                     if (main_inventory)
                     {
-                        LLInventoryObject *obj = gInventory.getObject(mCombinationGalleryPanel->getSelectedItemID());
+                        LLInventoryObject *obj = gInventory.getObject(mCombinationGalleryPanel->getFirstSelectedItemID());
                         if (obj)
                         {
                             main_inventory->findLinks(obj->getUUID(), obj->getName());
@@ -1905,7 +1905,7 @@ void LLPanelMainInventory::onCustomAction(const LLSD& userdata)
         LLSD params;
         if(mSingleFolderMode && isGalleryViewMode())
         {
-            params = LLSD(mCombinationGalleryPanel->getSelectedItemID());
+            params = LLSD(mCombinationGalleryPanel->getFirstSelectedItemID());
         }
         else
         {
@@ -1965,7 +1965,7 @@ void LLPanelMainInventory::onCustomAction(const LLSD& userdata)
     {
         if(mSingleFolderMode && isGalleryViewMode())
         {
-            std::set<LLUUID> uuids{ mCombinationGalleryPanel->getSelectedItemID()};
+            std::set<LLUUID> uuids{ mCombinationGalleryPanel->getFirstSelectedItemID()};
             LLAvatarActions::shareWithAvatars(uuids, gFloaterView->getParentFloater(this));
         }
         else
@@ -2009,7 +2009,7 @@ bool LLPanelMainInventory::isSaveTextureEnabled(const LLSD& userdata)
     LLViewerInventoryItem *inv_item = NULL;
     if(mSingleFolderMode && isGalleryViewMode())
     {
-        inv_item = gInventory.getItem(mCombinationGalleryPanel->getSelectedItemID());
+        inv_item = gInventory.getItem(mCombinationGalleryPanel->getFirstSelectedItemID());
     }
     else
     {
@@ -2059,7 +2059,7 @@ BOOL LLPanelMainInventory::isActionEnabled(const LLSD& userdata)
         LLUUID item_id;
         if(mSingleFolderMode && isGalleryViewMode())
         {
-            item_id = mCombinationGalleryPanel->getSelectedItemID();
+            item_id = mCombinationGalleryPanel->getFirstSelectedItemID();
         }
         else{
 		LLFolderViewItem* current_item = getActivePanel()->getRootFolder()->getCurSelectedItem();
@@ -2079,7 +2079,7 @@ BOOL LLPanelMainInventory::isActionEnabled(const LLSD& userdata)
         LLUUID item_id;
         if(mSingleFolderMode && isGalleryViewMode())
         {
-            item_id = mCombinationGalleryPanel->getSelectedItemID();
+            item_id = mCombinationGalleryPanel->getFirstSelectedItemID();
         }
         else{
 		LLFolderView* root = getActivePanel()->getRootFolder();
@@ -2114,7 +2114,7 @@ BOOL LLPanelMainInventory::isActionEnabled(const LLSD& userdata)
 	{
         if(mSingleFolderMode && isGalleryViewMode())
         {
-            return can_share_item(mCombinationGalleryPanel->getSelectedItemID());
+            return can_share_item(mCombinationGalleryPanel->getFirstSelectedItemID());
         }
         else{
 		LLFolderViewItem* current_item = getActivePanel()->getRootFolder()->getCurSelectedItem();
@@ -2626,7 +2626,7 @@ void LLPanelMainInventory::setGallerySelection(const LLUUID& item_id, bool new_w
 
 void LLPanelMainInventory::scrollToGallerySelection()
 {
-    mCombinationGalleryPanel->scrollToShowItem(mCombinationGalleryPanel->getSelectedItemID());
+    mCombinationGalleryPanel->scrollToShowItem(mCombinationGalleryPanel->getFirstSelectedItemID());
 }
 
 void LLPanelMainInventory::scrollToInvPanelSelection()