Merge branch 'master' of github.com:HazimGazov/Inertia

indra/llvfs/llvfile.h

@@ -80,10 +80,11 @@ public:
 	static const S32 READ_WRITE;
 	static const S32 APPEND;
 	
-protected:
 	LLAssetType::EType mFileType;
 
 	LLUUID	mFileID;
+
+protected:
 	S32		mPosition;
 	S32		mMode;
 	LLVFS	*mVFS;

indra/newview/CMakeLists.txt

@@ -76,6 +76,7 @@ set(viewer_SOURCE_FILES
     llanimstatelabels.cpp
     llao.cpp
     llappviewer.cpp
+    llassetconverter.cpp
     llassetuploadresponders.cpp
     llassetuploadqueue.cpp
     llaudiosourcevo.cpp
@@ -213,6 +214,7 @@ set(viewer_SOURCE_FILES
     llfloatertos.cpp
     llfloaterurldisplay.cpp
     llfloaterurlentry.cpp
+    llfloatervfs.cpp
     llfloatervoicedevicesettings.cpp
     llfloaterwater.cpp
     llfloaterwindlight.cpp
@@ -511,6 +513,7 @@ set(viewer_HEADER_FILES
     llao.h
     llappearance.h
     llappviewer.h
+    llassetconverter.h
     llassetuploadresponders.h
     llassetuploadqueue.h
     llaudiosourcevo.h
@@ -649,6 +652,7 @@ set(viewer_HEADER_FILES
     llfloatertos.h
     llfloaterurldisplay.h
     llfloaterurlentry.h
+    llfloatervfs.h
     llfloatervoicedevicesettings.h
     llfloaterwater.h
     llfloaterwindlight.h

indra/newview/llassetconverter.cpp

@@ -0,0 +1,178 @@
+// <edit>
+#include "llviewerprecompiledheaders.h"
+#include "llvfs.h"
+#include "llapr.h"
+#include "llvfile.h"
+#include "llassetconverter.h"
+#include "llviewerimagelist.h"
+#include "llvorbisencode.h"
+#include "llbvhloader.h"
+// static
+LLAssetType::EType LLAssetConverter::convert(std::string src_filename, std::string filename)
+{
+	std::string exten = gDirUtilp->getExtension(src_filename);
+	LLAssetType::EType asset_type = LLAssetType::AT_NONE;
+	if (exten.empty())
+		return LLAssetType::AT_NONE;
+	else if(exten == "bmp")
+	{
+		asset_type = LLAssetType::AT_TEXTURE;
+		if (!LLViewerImageList::createUploadFile(src_filename,
+												 filename,
+												 IMG_CODEC_BMP ))
+		{
+			return LLAssetType::AT_NONE;
+		}
+	}
+	else if( exten == "tga")
+	{
+		asset_type = LLAssetType::AT_TEXTURE;
+		if (!LLViewerImageList::createUploadFile(src_filename,
+												 filename,
+												 IMG_CODEC_TGA ))
+		{
+			return LLAssetType::AT_NONE;
+		}
+	}
+	else if( exten == "jpg" || exten == "jpeg")
+	{
+		asset_type = LLAssetType::AT_TEXTURE;
+		if (!LLViewerImageList::createUploadFile(src_filename,
+												 filename,
+												 IMG_CODEC_JPEG ))
+		{
+			return LLAssetType::AT_NONE;
+		}
+	}
+ 	else if( exten == "png")
+ 	{
+ 		asset_type = LLAssetType::AT_TEXTURE;
+ 		if (!LLViewerImageList::createUploadFile(src_filename,
+ 												 filename,
+ 												 IMG_CODEC_PNG ))
+ 		{
+ 			return LLAssetType::AT_NONE;
+ 		}
+ 	}
+	else if(exten == "wav")
+	{
+		asset_type = LLAssetType::AT_SOUND;
+		if(encode_vorbis_file(src_filename, filename) != LLVORBISENC_NOERR)
+		{
+			return LLAssetType::AT_NONE;
+		}
+	}
+	else if(exten == "ogg")
+	{
+		asset_type = LLAssetType::AT_SOUND;
+		if(!copyFile(src_filename, filename))
+		{
+			return LLAssetType::AT_NONE;
+		}
+	}
+	//else if(exten == "tmp") FIXME
+	else if (exten == "bvh")
+	{
+		asset_type = LLAssetType::AT_ANIMATION;
+		S32 file_size;
+		LLAPRFile fp;
+		fp.open(src_filename, LL_APR_RB, LLAPRFile::global, &file_size);
+		if(!fp.getFileHandle()) return LLAssetType::AT_NONE;
+		char* file_buffer = new char[file_size + 1];
+		if(fp.read(file_buffer, file_size) == 0) //not sure if this is right, gotta check this one
+		{
+			fp.close();
+			delete[] file_buffer;
+			return LLAssetType::AT_NONE;
+		}
+		LLBVHLoader* loaderp = new LLBVHLoader(file_buffer);
+		if(!loaderp->isInitialized())
+		{
+			fp.close();
+			delete[] file_buffer;
+			return LLAssetType::AT_NONE;
+		}
+		S32 buffer_size = loaderp->getOutputSize();
+		U8* buffer = new U8[buffer_size];
+		LLDataPackerBinaryBuffer dp(buffer, buffer_size);
+		loaderp->serialize(dp);
+		LLAPRFile apr_file(filename, LL_APR_WB, LLAPRFile::global);
+		apr_file.write(buffer, buffer_size);
+		delete[] file_buffer;
+		delete[] buffer;
+		fp.close();
+		apr_file.close();
+	}
+	else if (exten == "animatn")
+	{
+		asset_type = LLAssetType::AT_ANIMATION;
+		if(!copyFile(src_filename, filename))
+		{
+			return LLAssetType::AT_NONE;
+		}
+	}
+	else if(exten == "jp2" || exten == "j2k" || exten == "j2c")
+	{
+		asset_type = LLAssetType::AT_TEXTURE;
+		if(!copyFile(src_filename, filename))
+		{
+			return LLAssetType::AT_NONE;
+		}
+	}
+	else if(exten == "gesture")
+	{
+		asset_type = LLAssetType::AT_GESTURE;
+		if(!copyFile(src_filename, filename))
+		{
+			return LLAssetType::AT_NONE;
+		}
+	}
+	else if(exten == "notecard")
+	{
+		asset_type = LLAssetType::AT_NOTECARD;
+		if(!copyFile(src_filename, filename))
+		{
+			return LLAssetType::AT_NONE;
+		}
+	}
+	else if(exten == "lsl")
+	{
+		asset_type = LLAssetType::AT_LSL_TEXT;
+		if(!copyFile(src_filename, filename))
+		{
+			return LLAssetType::AT_NONE;
+		}
+	}
+	else if(exten == "eyes" || exten == "gloves" || exten == "hair" || exten == "jacket" || exten == "pants" || exten == "shape" || exten == "shirt" || exten == "shoes" || exten == "skin" || exten == "skirt" || exten == "socks" || exten == "underpants" || exten == "undershirt" || exten == "bodypart" || exten == "clothing")
+	{
+		asset_type = LLAssetType::AT_CLOTHING;
+		if(!copyFile(src_filename, filename))
+		{
+			return LLAssetType::AT_NONE;
+		}
+	}
+	else
+	{
+		llwarns << "Unhandled extension" << llendl;
+		return LLAssetType::AT_NONE;
+	}
+	return asset_type;
+}
+BOOL LLAssetConverter::copyFile(std::string src_filename, std::string dst_filename)
+{
+	S32 src_size;
+	LLAPRFile src_fp;
+	src_fp.open(src_filename, LL_APR_RB, LLAPRFile::global, &src_size);
+	if(!src_fp.getFileHandle()) return FALSE;
+	LLAPRFile dst_fp;
+	dst_fp.open(dst_filename, LL_APR_WB, LLAPRFile::global);
+	if(!dst_fp.getFileHandle()) return FALSE;
+	char* buffer = new char[src_size + 1];
+	src_fp.read(buffer, src_size);
+	dst_fp.write(buffer, src_size);
+	src_fp.close();
+	dst_fp.close();
+	delete[] buffer;
+	return TRUE;
+}
+// </edit>

indra/newview/llassetconverter.h

@@ -0,0 +1,15 @@
+// <edit>
+#ifndef LL_LLASSETCONVERTER_H
+#define LL_LLASSETCONVERTER_H
+
+#include "llcommon.h"
+#include "llassettype.h"
+
+class LLAssetConverter
+{
+public:
+	static LLAssetType::EType convert(std::string src_filename, std::string filename);
+	static BOOL copyFile(std::string src_filename, std::string dest_filename);
+};
+#endif
+// </edit>

indra/newview/llfloatervfs.cpp

@@ -0,0 +1,332 @@
+// <edit>
+#include "llviewerprecompiledheaders.h"
+#include "llfloatervfs.h"
+#include "lluictrlfactory.h"
+#include "llscrolllistctrl.h"
+#include "llfilepicker.h"
+#include "lllocalinventory.h"
+#include "llviewerwindow.h"
+#include "llassetconverter.h"
+LLFloaterVFS* LLFloaterVFS::sInstance;
+std::list<LLFloaterVFS::entry> LLFloaterVFS::mFiles;
+LLFloaterVFS::LLFloaterVFS()
+:	LLFloater(),
+	mEditID(LLUUID::null)
+{
+	LLUICtrlFactory::getInstance()->buildFloater(this, "floater_vfs.xml");
+}
+LLFloaterVFS::~LLFloaterVFS()
+{
+	sInstance = NULL;
+}
+// static
+void LLFloaterVFS::show()
+{
+	if(sInstance)
+		sInstance->open();
+	else
+	{
+		sInstance = new LLFloaterVFS();
+		sInstance->open();
+	}
+}
+BOOL LLFloaterVFS::postBuild()
+{
+	childSetAction("add_btn", onClickAdd, this);
+	childSetAction("clear_btn", onClickClear, this);
+	childSetAction("reload_all_btn", onClickReloadAll, this);
+	childSetCommitCallback("file_list", onCommitFileList, this);
+	childSetCommitCallback("name_edit", onCommitEdit, this);
+	childSetCommitCallback("id_edit", onCommitEdit, this);
+	childSetCommitCallback("type_combo", onCommitEdit, this);
+	childSetAction("copy_uuid_btn", onClickCopyUUID, this);
+	childSetAction("item_btn", onClickItem, this);
+	childSetAction("reload_btn", onClickReload, this);
+	childSetAction("remove_btn", onClickRemove, this);
+	refresh();
+	return TRUE;
+}
+void LLFloaterVFS::refresh()
+{
+	LLScrollListCtrl* list = getChild<LLScrollListCtrl>("file_list");
+	list->clearRows();
+	std::list<entry>::iterator end = mFiles.end();
+	for(std::list<entry>::iterator iter = mFiles.begin(); iter != end; ++iter)
+	{
+		entry file = (*iter);
+		LLSD element;
+		element["id"] = file.mID;
+		LLSD& name_column = element["columns"][0];
+		name_column["column"] = "name";
+		name_column["value"] = file.mName.empty() ? file.mID.asString() : file.mName;
+		LLSD& type_column = element["columns"][1];
+		type_column["column"] = "type";
+		type_column["value"] = std::string(LLAssetType::lookup(file.mType));
+		list->addElement(element, ADD_BOTTOM);
+	}
+	setMassEnabled(!mFiles.empty());
+	setEditID(mEditID);
+}
+void LLFloaterVFS::add(entry file)
+{
+	mFiles.push_back(file);
+	refresh();
+}
+void LLFloaterVFS::clear()
+{
+	std::list<entry>::iterator end = mFiles.end();
+	for(std::list<entry>::iterator iter = mFiles.begin(); iter != end; ++iter)
+	{
+		gVFS->removeFile((*iter).mID, (*iter).mType);
+	}
+	mFiles.clear();
+	refresh();
+}
+void LLFloaterVFS::reloadAll()
+{
+	std::list<entry>::iterator end = mFiles.end();
+	for(std::list<entry>::iterator iter = mFiles.begin(); iter != end; ++iter)
+	{
+		entry file = (*iter);
+		reloadEntry(file);
+	}
+	refresh();
+}
+void LLFloaterVFS::reloadEntry(entry file)
+{
+	gVFS->removeFile(file.mID, file.mType);
+	std::string file_name = file.mFilename;
+	S32 file_size;
+	LLAPRFile fp;
+	fp.open(file_name, LL_APR_RB, LLAPRFile::global, &file_size);
+	if(fp.getFileHandle())
+	{
+		LLVFile file(gVFS, file.mFileID, file.mFileType, LLVFile::WRITE);
+		file.setMaxSize(file_size);
+		const S32 buf_size = 65536;
+		U8 copy_buf[buf_size];
+		while ((file_size = fp.read(copy_buf, buf_size)))
+			file.write(copy_buf, file_size);
+		fp.close();
+	}
+	else
+	{
+		// todo: show a warning, couldn't open the original file
+		return;
+	}
+	refresh();
+}
+void LLFloaterVFS::setEditID(LLUUID edit_id)
+{
+	LLScrollListCtrl* list = getChild<LLScrollListCtrl>("file_list");
+	bool found_in_list = (list->getItemIndex(edit_id) != -1);
+	bool found_in_files = false;
+	entry file;
+	std::list<entry>::iterator end = mFiles.end();
+	for(std::list<entry>::iterator iter = mFiles.begin(); iter != end; ++iter)
+	{
+		if((*iter).mID == edit_id)
+		{
+			found_in_files = true;
+			file = (*iter);
+			break;
+		}
+	}
+	if(found_in_files && found_in_list)
+	{
+		mEditID = edit_id;
+		list->selectByID(edit_id);
+		setEditEnabled(true);
+		childSetText("name_edit", file.mName);
+		childSetText("id_edit", file.mID.asString());
+		childSetValue("type_combo", std::string(LLAssetType::lookup(file.mType)));
+	}
+	else
+	{
+		mEditID = LLUUID::null;
+		list->deselectAllItems(TRUE);
+		setEditEnabled(false);
+		childSetText("name_edit", std::string(""));
+		childSetText("id_edit", std::string(""));
+		childSetValue("type_combo", std::string("animatn"));
+	}
+}
+LLFloaterVFS::entry LLFloaterVFS::getEditEntry()
+{
+	std::list<entry>::iterator end = mFiles.end();
+	for(std::list<entry>::iterator iter = mFiles.begin(); iter != end; ++iter)
+	{
+		if((*iter).mID == mEditID)
+			return (*iter);
+	}
+	entry file;
+	file.mID = LLUUID::null;
+	return file;
+}
+void LLFloaterVFS::commitEdit()
+{
+	bool found = false;
+	entry file;
+	std::list<entry>::iterator iter;
+	std::list<entry>::iterator end = mFiles.end();
+	for(iter = mFiles.begin(); iter != end; ++iter)
+	{
+		if((*iter).mID == mEditID)
+		{
+			found = true;
+			file = (*iter);
+			break;
+		}
+	}
+	if(!found) return;
+	entry edited_file;
+	edited_file.mName = childGetValue("name_edit").asString();
+	edited_file.mID = LLUUID(childGetValue("id_edit").asString());
+	edited_file.mType = LLAssetType::lookup(getChild<LLComboBox>("type_combo")->getValue().asString());
+	if((edited_file.mID != file.mID) || (edited_file.mType != file.mType))
+	{
+		gVFS->renameFile(file.mID, file.mType, edited_file.mID, edited_file.mType);
+		mEditID = edited_file.mID;
+	}
+	(*iter) = edited_file;
+	refresh();
+}
+void LLFloaterVFS::removeEntry()
+{
+	for(std::list<entry>::iterator iter = mFiles.begin(); iter != mFiles.end(); )
+	{
+		if((*iter).mID == mEditID)
+		{
+			gVFS->removeFile((*iter).mID, (*iter).mType);
+			iter = mFiles.erase(iter);
+		}
+		else ++iter;
+	}
+	refresh();
+}
+void LLFloaterVFS::setMassEnabled(bool enabled)
+{
+	childSetEnabled("clear_btn", enabled);
+	childSetEnabled("reload_all_btn", false); // DOESN'T WORK
+}
+void LLFloaterVFS::setEditEnabled(bool enabled)
+{
+	childSetEnabled("name_edit", enabled);
+	childSetEnabled("id_edit", false); // DOESN'T WORK
+	childSetEnabled("type_combo", false); // DOESN'T WORK
+	childSetEnabled("copy_uuid_btn", enabled);
+	childSetEnabled("item_btn", enabled);
+	childSetEnabled("reload_btn", false); // DOESN'T WORK
+	childSetEnabled("remove_btn", enabled);
+}
+// static
+void LLFloaterVFS::onClickAdd(void* user_data)
+{
+	LLFloaterVFS* floaterp = (LLFloaterVFS*)user_data;
+	if(!floaterp) return;
+	LLUUID asset_id;
+	LLAssetType::EType asset_type = LLAssetType::AT_NONE;
+	asset_id.generate();
+	LLFilePicker& file_picker = LLFilePicker::instance();
+	if(file_picker.getOpenFile(LLFilePicker::FFLOAD_ALL))
+	{
+		std::string file_name = file_picker.getFirstFile();
+		std::string temp_filename = file_name + ".tmp";
+		asset_type = LLAssetConverter::convert(file_name, temp_filename);
+		if(asset_type == LLAssetType::AT_NONE)
+		{
+			// todo: show a warning
+			return;
+		}
+		S32 file_size;
+		LLAPRFile fp;
+		fp.open(temp_filename, LL_APR_RB, LLAPRFile::global, &file_size);
+		if(fp.getFileHandle())
+		{
+			LLVFile file(gVFS, asset_id, asset_type, LLVFile::WRITE);
+			file.setMaxSize(file_size);
+			const S32 buf_size = 65536;
+			U8 copy_buf[buf_size];
+			while ((file_size = fp.read(copy_buf, buf_size)))
+				file.write(copy_buf, file_size);
+			fp.close();
+		}
+		else
+		{
+			if(temp_filename != file_name)
+			{
+				LLFile::remove(temp_filename);
+			}
+			// todo: show a warning, couldn't open the selected file
+			return;
+		}
+		if(temp_filename != file_name)
+		{
+			LLFile::remove(temp_filename);
+		}
+		entry file;
+		file.mFilename = file_name;
+		file.mID = asset_id;
+		file.mType = asset_type;
+		file.mName = gDirUtilp->getBaseFileName(file_name, true);
+		floaterp->add(file);
+	}
+}
+// static
+void LLFloaterVFS::onClickClear(void* user_data)
+{
+	LLFloaterVFS* floaterp = (LLFloaterVFS*)user_data;
+	if(!floaterp) return;
+	floaterp->clear();
+}
+// static
+void LLFloaterVFS::onClickReloadAll(void* user_data)
+{
+	LLFloaterVFS* floaterp = (LLFloaterVFS*)user_data;
+	if(!floaterp) return;
+	floaterp->reloadAll();
+}
+// static
+void LLFloaterVFS::onCommitFileList(LLUICtrl* ctrl, void* user_data)
+{
+	LLFloaterVFS* floaterp = (LLFloaterVFS*)user_data;
+	LLScrollListCtrl* list = floaterp->getChild<LLScrollListCtrl>("file_list");
+	LLUUID selected_id(LLUUID::null);
+	if(list->getFirstSelected())
+		selected_id = list->getFirstSelected()->getUUID();
+	floaterp->setEditID(selected_id);
+}
+// static
+void LLFloaterVFS::onCommitEdit(LLUICtrl* ctrl, void* user_data)
+{
+	LLFloaterVFS* floaterp = (LLFloaterVFS*)user_data;
+	floaterp->commitEdit();
+}
+// static
+void LLFloaterVFS::onClickCopyUUID(void* user_data)
+{
+	LLFloaterVFS* floaterp = (LLFloaterVFS*)user_data;
+	entry file = floaterp->getEditEntry();
+	gViewerWindow->mWindow->copyTextToClipboard(utf8str_to_wstring(file.mID.asString()));
+}
+// static
+void LLFloaterVFS::onClickItem(void* user_data)
+{
+	LLFloaterVFS* floaterp = (LLFloaterVFS*)user_data;
+	entry file = floaterp->getEditEntry();
+	LLLocalInventory::addItem(file.mName, (int)file.mType, file.mID, true);
+}
+// static
+void LLFloaterVFS::onClickReload(void* user_data)
+{
+	LLFloaterVFS* floaterp = (LLFloaterVFS*)user_data;
+	entry file = floaterp->getEditEntry();
+	floaterp->reloadEntry(file);
+}
+// static
+void LLFloaterVFS::onClickRemove(void* user_data)
+{
+	LLFloaterVFS* floaterp = (LLFloaterVFS*)user_data;
+	floaterp->removeEntry();
+}
+// </edit>

indra/newview/llfloatervfs.h

@@ -0,0 +1,46 @@
+// <edit>
+#ifndef LL_LLFLOATERVFS_H
+#define LL_LLFLOATERVFS_H
+#include "llfloater.h"
+#include "llassettype.h"
+class LLFloaterVFS : LLFloater
+{
+typedef struct
+{
+	std::string mFilename;
+	std::string mName;
+	LLUUID mID;
+	LLAssetType::EType mType;
+} entry;
+public:
+	LLFloaterVFS();
+	~LLFloaterVFS();
+	static void show();
+	BOOL postBuild();
+	void refresh();
+	void add(entry file);
+	void clear();
+	void reloadAll();
+	void setEditID(LLUUID edit_id);
+	entry getEditEntry();
+	void commitEdit();
+	void reloadEntry(entry file);
+	void removeEntry();
+	static void onClickAdd(void* user_data);
+	static void onClickClear(void* user_data);
+	static void onClickReloadAll(void* user_data);
+	static void onCommitFileList(LLUICtrl* ctrl, void* user_data);
+	static void onCommitEdit(LLUICtrl* ctrl, void* user_data);
+	static void onClickCopyUUID(void* user_data);
+	static void onClickItem(void* user_data);
+	static void onClickReload(void* user_data);
+	static void onClickRemove(void* user_data);
+private:
+	static LLFloaterVFS* sInstance;
+	static std::list<entry> mFiles;
+	LLUUID mEditID;
+	void setMassEnabled(bool enabled);
+	void setEditEnabled(bool enabled);
+};
+#endif
+// </edit>

indra/newview/llinventoryactions.cpp

@@ -550,6 +550,18 @@ class LLLoadInvCacheFloater : public inventory_listener_t
 		return true;
 	}
 };
+
+class LLRefreshInvModel : public inventory_listener_t
+{
+	bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
+	{
+		LLInventoryModel* model = mPtr->getPanel()->getModel();
+		if(!model) return false;
+		model->empty();
+		model->startBackgroundFetch();
+		return true;
+	}
+};
 // </edit>
 class LLSetSortBy : public inventory_listener_t
 {

indra/newview/llinventorymodel.h

@@ -391,7 +391,7 @@ public:
 	void addCategory(LLViewerInventoryCategory* category);
 	void addItem(LLViewerInventoryItem* item);
 // <edit>
-protected:
+//protected:
 // </edit>
 
 	// Internal method which looks for a category with the specified

indra/newview/llviewermenu.cpp

@@ -234,6 +234,7 @@
 #include "llfloatermessagelog.h"
 #include "llfloatermessagebuilder.h"
 #include "llao.h"
+#include "llfloatervfs.h"
 #include "llfloaterexportregion.h"
 // </edit>
 
@@ -402,6 +403,7 @@ void handle_reopen_with_hex_editor(void*);
 void handle_open_message_log(void*);
 void handle_open_message_builder(void*);
 void handle_edit_ao(void*);
+void handle_local_assets(void*);
 // </edit>
 
 BOOL is_inventory_visible( void* user_data );
@@ -752,6 +754,9 @@ void init_client_menu(LLMenuGL* menu)
 										
 		sub->append(new LLMenuItemCallGL(  "Message Log", &handle_open_message_log, NULL));
 		sub->append(new LLMenuItemCallGL(  "Message Builder", &handle_open_message_builder, NULL));	
+
+		sub->append(new LLMenuItemCallGL(	"Local Assets...",
+												&handle_local_assets, NULL));
 		
 		sub->append(new LLMenuItemCheckGL( "Enable AO",
 										&menu_toggle_control,
@@ -3084,6 +3089,11 @@ void handle_edit_ao(void*)
 	LLFloaterAO::show();
 }
 
+void handle_local_assets(void*)
+{
+	LLFloaterVFS::show();
+}
+
 void handle_close_all_notifications(void*)
 {
 	LLView::child_list_t child_list(*(gNotifyBoxView->getChildList()));

indra/newview/skins/default/xui/en-us/floater_inventory.xml

@@ -60,6 +60,10 @@
 			     name="Load InvCache..." width="128">
 				<on_click filter="" function="Inventory.LoadInvCache" userdata="" />
 			</menu_item_call>
+			<menu_item_call bottom_delta="-18" height="18" label="Refresh Inventory" left="0" mouse_opaque="true"
+			     name="Refresh Inventory" width="128">
+				<on_click filter="" function="Inventory.RefreshInvModel" userdata="" />
+			</menu_item_call>
 		</menu>
 		<menu bottom_delta="80" drop_shadow="true" height="121"
 		     label="Create" left="0" mouse_opaque="false" name="Create" opaque="true"

indra/newview/skins/default/xui/en-us/floater_vfs.xml

@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater can_close="true" can_drag_on_left="false" can_minimize="true"
+     can_resize="false" width="320" min_width="320" height="300" min_height="300"
+     name="floater_vfs" title="Local Assets" rect_control="FloaterVFSRect">
+	<button name="add_btn" follows="left|top" width="100" bottom="-45" left="10" height="20" label="Add..."/>
+	<button name="clear_btn" follows="left|top" width="100" left_delta="100" bottom_delta="0" height="20" label="Clear"/>
+	<button name="reload_all_btn" follows="left|top" width="100" left_delta="100" bottom_delta="0" height="20" label="Reload All"/>
+	<scroll_list bottom="75" can_resize="true" column_padding="0" draw_heading="true"
+	     follows="left|top|bottom|right" left="10" multi_select="true"
+	     name="file_list" right="-10" search_column="0" top="-50">
+		<column dynamicwidth="true" name="name" label="name" />
+		<column name="type" label="type" width="100" />
+	</scroll_list>
+	<line_editor name="name_edit" follows="left|bottom|right" bottom="53" left="10" width="300" height="20"/>
+	<line_editor name="id_edit" follows="left|bottom|right" bottom_delta="-23" left="10" width="200" height="20"/>
+	<combo_box allow_text_entry="false" bottom_delta="-1" follows="left|bottom|right" height="20"
+					 left="210" max_chars="20" mouse_opaque="true" name="type_combo" width="100">
+		<combo_item name="texture" value="texture">
+			texture
+		</combo_item>
+		<combo_item name="sound" value="sound">
+			sound
+		</combo_item>
+		<combo_item name="callcard" value="callcard">
+			callcard
+		</combo_item>
+		<combo_item name="landmark" value="landmark">
+			landmark
+		</combo_item>
+		<combo_item name="script" value="script">
+			script
+		</combo_item>
+		<combo_item name="clothing" value="clothing">
+			clothing
+		</combo_item>
+		<combo_item name="object" value="object">
+			object
+		</combo_item>
+		<combo_item name="notecard" value="notecard">
+			notecard
+		</combo_item>
+		<combo_item name="category" value="category">
+			category
+		</combo_item>
+		<combo_item name="root" value="root">
+			root
+		</combo_item>
+		<combo_item name="lsltext" value="lsltext">
+			lsltext
+		</combo_item>
+		<combo_item name="lslbyte" value="lslbyte">
+			lslbyte
+		</combo_item>
+		<combo_item name="txtr_tga" value="txtr_tga">
+			txtr_tga
+		</combo_item>
+		<combo_item name="bodypart" value="bodypart">
+			bodypart
+		</combo_item>
+		<combo_item name="trash" value="trash">
+			trash
+		</combo_item>
+		<combo_item name="snapshot" value="snapshot">
+			snapshot
+		</combo_item>
+		<combo_item name="lstndfnd" value="lstndfnd">
+			lstndfnd
+		</combo_item>
+		<combo_item name="snd_wav" value="snd_wav">
+			snd_wav
+		</combo_item>
+		<combo_item name="img_tga" value="img_tga">
+			img_tga
+		</combo_item>
+		<combo_item name="jpeg" value="jpeg">
+			jpeg
+		</combo_item>
+		<combo_item name="animatn" value="animatn">
+			animatn
+		</combo_item>
+		<combo_item name="gesture" value="gesture">
+			gesture
+		</combo_item>
+		<combo_item name="simstate" value="simstate">
+			simstate
+		</combo_item>
+	</combo_box>
+	<button name="copy_uuid_btn" follows="left|bottom" width="75" bottom="7" left="10" height="20" label="Copy UUID"/>
+	<button name="item_btn" follows="left|bottom" width="75" bottom_delta="0" left_delta="75" height="20" label="Item"/>
+	<button name="reload_btn" follows="left|bottom" width="75" bottom_delta="0" left_delta="75" height="20" label="Reload"/>
+	<button name="remove_btn" follows="left|bottom" width="75" bottom_delta="0" left_delta="75" height="20" label="Remove"/>
+</floater>

install.xml

@@ -221,9 +221,9 @@
           <key>windows</key>
           <map>
             <key>md5sum</key>
-            <string>2d970742d2601a41c6b7e7aec78c141f</string>
+            <string>ed53511382d0fd9fec59a9f6544d9672</string>
             <key>url</key>
-            <uri>http://github.com/downloads/HazimGazov/Inertia/boost-1.39.0-windows-20100425.tar.bz2</uri>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/boost-1.39.0-windows-20091029.tar.bz2</uri>
           </map>
         </map>
       </map>