SL-19310 Update navigation buttons in single-folder view

1 files changed, 16 insertions, 0 deletions

diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp
index fd245a2b4d..1eb2d5bbdc 100644
--- a/indra/newview/llpanelmaininventory.cpp
+++ b/indra/newview/llpanelmaininventory.cpp
@@ -374,6 +374,10 @@ BOOL LLPanelMainInventory::handleKeyHere(KEY key, MASK mask)
 		{
 			startSearch();
 		}
+        if(mSingleFolderMode && key == KEY_LEFT)
+        {
+            onBackFolderClicked();
+        }
 	}
 
 	return LLPanel::handleKeyHere(key, mask);
@@ -1327,6 +1331,7 @@ void LLPanelMainInventory::setSingleFolderViewRoot(const LLUUID& folder_id, bool
     if(clear_nav_history)
     {
         mSingleFolderPanelInventory->clearNavigationHistory();
+        updateNavButtons();
     }
 }
 
@@ -1756,6 +1761,17 @@ void LLPanelMainInventory::updateTitle()
             inventory_floater->setTitle(getString("inventory_title"));
         }
     }
+    updateNavButtons();
+}
+
+void LLPanelMainInventory::updateNavButtons()
+{
+    getChild<LLButton>("back_btn")->setEnabled(mSingleFolderPanelInventory->isBackwardAvailable());
+    getChild<LLButton>("forward_btn")->setEnabled(mSingleFolderPanelInventory->isForwardAvailable());
+    
+    const LLViewerInventoryCategory* cat = gInventory.getCategory(mSingleFolderPanelInventory->getSingleFolderRoot());
+    bool up_enabled = (cat && cat->getParentUUID().notNull());
+    getChild<LLButton>("up_btn")->setEnabled(up_enabled);
 }
 
 LLSidepanelInventory* LLPanelMainInventory::getParentSidepanelInventory()