start VFS Explorer

indra/llvfs/llvfs.cpp

@@ -2062,6 +2062,16 @@ void LLVFS::listFiles()
 	unlockData();
 }
 
+std::map<LLVFSFileSpecifier, LLVFSFileBlock*> LLVFS::getFileList()
+{
+	//have to do this so as not to mess with the gods of threading
+	lockData();
+	fileblock_map mFileList = mFileBlocks;
+	unlockData();
+
+	return mFileList;
+}
+
 #include "llapr.h"
 void LLVFS::dumpFiles()
 {

indra/llvfs/llvfs.h

@@ -143,10 +143,14 @@ protected:
 	void lockData() { mDataMutex->lock(); }
 	void unlockData() { mDataMutex->unlock(); }	
 	
-protected:
 	LLMutex* mDataMutex;
-	
+
+//<edit>
+public:
 	typedef std::map<LLVFSFileSpecifier, LLVFSFileBlock*> fileblock_map;
+	std::map<LLVFSFileSpecifier, LLVFSFileBlock*> getFileList();
+//</edit>
+protected:
 	fileblock_map mFileBlocks;
 
 	typedef std::multimap<S32, LLVFSBlock*>	blocks_length_map_t;

indra/newview/CMakeLists.txt

@@ -215,6 +215,7 @@ set(viewer_SOURCE_FILES
     llfloaterurldisplay.cpp
     llfloaterurlentry.cpp
     llfloatervfs.cpp
+    llfloatervfsexplorer.cpp
     llfloatervoicedevicesettings.cpp
     llfloaterwater.cpp
     llfloaterwindlight.cpp
@@ -653,6 +654,7 @@ set(viewer_HEADER_FILES
     llfloaterurldisplay.h
     llfloaterurlentry.h
     llfloatervfs.h
+    llfloatervfsexplorer.h
     llfloatervoicedevicesettings.h
     llfloaterwater.h
     llfloaterwindlight.h

indra/newview/llviewermenu.cpp

@@ -235,6 +235,7 @@
 #include "llfloatermessagebuilder.h"
 #include "llao.h"
 #include "llfloatervfs.h"
+#include "llfloatervfsexplorer.h"
 #include "llfloaterexportregion.h"
 // </edit>
 
@@ -404,6 +405,7 @@ void handle_open_message_log(void*);
 void handle_open_message_builder(void*);
 void handle_edit_ao(void*);
 void handle_local_assets(void*);
+void handle_vfs_explorer(void*);
 // </edit>
 
 BOOL is_inventory_visible( void* user_data );
@@ -757,6 +759,8 @@ void init_client_menu(LLMenuGL* menu)
 
 		sub->append(new LLMenuItemCallGL(	"Local Assets...",
 												&handle_local_assets, NULL));
+		sub->append(new LLMenuItemCallGL(	"VFS Explorer",
+												&handle_vfs_explorer, NULL));
 		
 		sub->append(new LLMenuItemCheckGL( "Enable AO",
 										&menu_toggle_control,
@@ -3094,6 +3098,11 @@ void handle_local_assets(void*)
 	LLFloaterVFS::show();
 }
 
+void handle_vfs_explorer(void*)
+{
+	LLFloaterVFSExplorer::show();
+}
+
 void handle_close_all_notifications(void*)
 {
 	LLView::child_list_t child_list(*(gNotifyBoxView->getChildList()));