indra/llui/llfolderview.cpp

@@ -288,6 +288,13 @@ void LLFolderView::addFolder( LLFolderViewFolder* folder)
 	LLFolderViewFolder::addFolder(folder);
 }
 
+void LLFolderView::openAllFolders()
+{
+	// Open all the folders
+	setOpenArrangeRecursively(TRUE, LLFolderViewFolder::RECURSE_DOWN);
+	arrangeAll();
+}
+
 void LLFolderView::closeAllFolders()
 {
 	// Close all the folders

indra/llui/llfolderview.h

@@ -128,6 +128,7 @@ class LLFolderView : public LLFolderViewFolder, public LLEditMenuHandler
 	bool getAllowDrag() { return mAllowDrag; }
 
 	// Close all folders in the view
+	void openAllFolders();
 	void closeAllFolders();
 	void openTopLevelFolders();
 

indra/newview/app_settings/commands.xml

@@ -284,6 +284,13 @@
            is_running_function="Floater.IsOpen"
            is_running_parameters="snapshot"
            />
+<command name="snapshottodisk"
+           available_in_toybox="true"
+           icon="Command_Snapshot_Disk_Icon"
+           label_ref="Command_Snapshot_Disk_Label"
+           tooltip_ref="Command_Snapshot_Disk_Tooltip"
+           execute_function="File.TakeSnapshotToDisk"
+           />
   <command name="speak"
            available_in_toybox="true"
            icon="Command_Speak_Icon"

indra/newview/llpanelmaininventory.cpp

@@ -120,6 +120,7 @@ LLPanelMainInventory::LLPanelMainInventory(const LLPanel::Params& p)
 {
 	// Menu Callbacks (non contex menus)
 	mCommitCallbackRegistrar.add("Inventory.DoToSelected", boost::bind(&LLPanelMainInventory::doToSelected, this, _2));
+	mCommitCallbackRegistrar.add("Inventory.OpenAllFolders", boost::bind(&LLPanelMainInventory::openAllFolders, this));
 	mCommitCallbackRegistrar.add("Inventory.CloseAllFolders", boost::bind(&LLPanelMainInventory::closeAllFolders, this));
 	mCommitCallbackRegistrar.add("Inventory.EmptyTrash", boost::bind(&LLInventoryModel::emptyFolderType, &gInventory, "ConfirmEmptyTrash", LLFolderType::FT_TRASH));
 	mCommitCallbackRegistrar.add("Inventory.EmptyLostAndFound", boost::bind(&LLInventoryModel::emptyFolderType, &gInventory, "ConfirmEmptyLostAndFound", LLFolderType::FT_LOST_AND_FOUND));
@@ -353,6 +354,11 @@ void LLPanelMainInventory::doToSelected(const LLSD& userdata)
 	getPanel()->doToSelected(userdata);
 }
 
+void LLPanelMainInventory::openAllFolders()
+{
+	getPanel()->getRootFolder()->openAllFolders();
+}
+
 void LLPanelMainInventory::closeAllFolders()
 {
 	getPanel()->getRootFolder()->closeAllFolders();
@@ -1272,6 +1278,10 @@ void LLPanelMainInventory::onCustomAction(const LLSD& userdata)
 	{
 		resetFilters();
 	}
+	if (command_name == "open_folders")
+	{
+		openAllFolders();
+	}
 	if (command_name == "close_folders")
 	{
 		closeAllFolders();

indra/newview/llpanelmaininventory.h

@@ -115,6 +115,7 @@ class LLPanelMainInventory : public LLPanel, LLInventoryObserver
 
 	// menu callbacks
 	void doToSelected(const LLSD& userdata);
+	void openAllFolders();
 	void closeAllFolders();
 	void doCreate(const LLSD& userdata);
 	void resetFilters();

indra/newview/skins/default/textures/textures.xml

@@ -163,6 +163,7 @@ with the same filename but different name
   <texture name="Command_Stats_Icon"        file_name="toolbar_icons/stats.png"        preload="true" />
   <texture name="Command_Search_Icon"       file_name="toolbar_icons/search.png"       preload="true" />
   <texture name="Command_Snapshot_Icon"     file_name="toolbar_icons/snapshot.png"     preload="true" />
+  <texture name="Command_Snapshot_Disk_Icon" file_name="toolbar_icons/snapshot_disk.png"     preload="true" />
   <texture name="Command_Speak_Icon"        file_name="toolbar_icons/speak.png"        preload="true" />
   <texture name="Command_View_Icon"         file_name="toolbar_icons/view.png"         preload="true" />
   <texture name="Command_Voice_Icon"        file_name="toolbar_icons/nearbyvoice.png"  preload="true" />

indra/newview/skins/default/xui/en/menu_inventory_gear_default.xml

@@ -79,6 +79,14 @@
          function="Inventory.GearDefault.Custom.Action"
          parameter="reset_filters" />
     </menu_item_call>
+    <menu_item_call
+     label="Open All Folders"
+     layout="topleft"
+     name="open_folders">
+        <on_click
+         function="Inventory.GearDefault.Custom.Action"
+         parameter="open_folders" />
+    </menu_item_call>
     <menu_item_call
      label="Close All Folders"
      layout="topleft"

indra/newview/skins/default/xui/en/panel_main_inventory.xml

@@ -183,6 +183,52 @@
            top="0"
            width="31" />
       </layout_panel>
+      <layout_panel
+       auto_resize="false"
+       height="25"
+       layout="topleft"
+       name="open_folder_btn_panel"
+       width="32">
+          <button
+           follows="bottom|left"
+           height="25"
+           image_hover_unselected="Toolbar_Middle_Over"
+           image_overlay="Inv_FolderOpen"
+           image_selected="Toolbar_Middle_Selected"
+           image_unselected="Toolbar_Middle_Off"
+           layout="topleft"
+           left="0"
+           name="open_folder_btn"
+           tool_tip="Open all folders"
+           top="0"
+           width="31">
+            <button.commit_callback
+             function="Inventory.OpenAllFolders" />
+         </button>
+      </layout_panel>
+      <layout_panel
+       auto_resize="false"
+       height="25"
+       layout="topleft"
+       name="close_folder_btn_panel"
+       width="32">
+          <button
+           follows="bottom|left"
+           height="25"
+           image_hover_unselected="Toolbar_Middle_Over"
+           image_overlay="Inv_FolderClosed"
+           image_selected="Toolbar_Middle_Selected"
+           image_unselected="Toolbar_Middle_Off"
+           layout="topleft"
+           left="0"
+           name="close_folder_btn"
+           tool_tip="Close all folders"
+           top="0"
+           width="31">
+            <button.commit_callback
+             function="Inventory.CloseAllFolders" />
+         </button>
+      </layout_panel>
       <layout_panel
        auto_resize="true"
        height="25"

indra/newview/skins/default/xui/en/strings.xml

@@ -4168,6 +4168,7 @@ Try enclosing path to the editor with double quotes.
   <string name="Command_Stats_Label">Statistics</string>
   <string name="Command_Search_Label">Search</string>
   <string name="Command_Snapshot_Label">Snapshot</string>
+  <string name="Command_Snapshot_Disk_Label">Snapshot to Disk</string>
   <string name="Command_Speak_Label">Speak</string>
   <string name="Command_View_Label">Camera</string>
   <string name="Command_Voice_Label">Voice Settings</string>
@@ -4205,7 +4206,8 @@ Try enclosing path to the editor with double quotes.
   <string name="Command_Scripts_Tooltip">Scripts attached to your avatar</string>
   <string name="Command_Stats_Tooltip">Statistics like FPS, network usage and sim performance</string>
   <string name="Command_Search_Tooltip">Find places, events, people</string>
-  <string name="Command_Snapshot_Tooltip">Take a picture</string>
+  <string name="Command_Snapshot_Tooltip">Open the snapshot floater</string>
+  <string name="Command_Snapshot_Disk_Tooltip">Take a picture immediately</string>
   <string name="Command_Speak_Tooltip">Speak with people nearby using your microphone</string>
   <string name="Command_View_Tooltip">Changing camera angle</string>
   <string name="Command_Voice_Tooltip">Volume controls for calls and people near you in world</string>