SL-19274 Add new double-click option to Inventory settings

1 files changed, 12 insertions, 12 deletions

diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index f7b7a6635e..5f1db0895c 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -413,7 +413,7 @@ void LLInvFVBridge::showProperties()
     }
 }
 
-void LLInvFVBridge::navigateToFolder(bool new_window)
+void LLInvFVBridge::navigateToFolder(bool new_window, bool change_mode)
 {
     if(new_window)
     {
@@ -421,21 +421,21 @@ void LLInvFVBridge::navigateToFolder(bool new_window)
     }
     else
     {
-        LLInventorySingleFolderPanel* panel = dynamic_cast<LLInventorySingleFolderPanel*>(mInventoryPanel.get());
-        if (!panel)
+        if(change_mode)
         {
-            return;
-        }
-        LLInventoryModel* model = getInventoryModel();
-        if (!model)
-        {
-            return;
+            LLInventoryPanel::setSFViewAndOpenFolder(mInventoryPanel.get(), mUUID);
         }
-        if (mUUID.isNull())
+        else
         {
-            return;
+            LLInventorySingleFolderPanel* panel = dynamic_cast<LLInventorySingleFolderPanel*>(mInventoryPanel.get());
+            if (!panel || !getInventoryModel() || mUUID.isNull())
+            {
+                return;
+            }
+
+            panel->changeFolderRoot(mUUID);
         }
-        panel->changeFolderRoot(mUUID);
+
     }
 }