Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix vfs file reloading

Browse Source
This commit is contained in:
Hazim Gazov
2010-06-20 13:50:34 +00:00
parent 944f7bcc93
commit 03786c6cb5
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llfloatervfs.cpp
View File

@@ -95,6 +95,8 @@ void LLFloaterVFS::reloadAll()
}
void LLFloaterVFS::reloadEntry(entry file)
{
LLUUID asset_id = file.mID;
LLAssetType::EType asset_type = file.mType;
gVFS->removeFile(file.mID, file.mType);
std::string file_name = file.mFilename;
S32 file_size;
@@ -102,7 +104,7 @@ void LLFloaterVFS::reloadEntry(entry file)
fp.open(file_name, LL_APR_RB, LLAPRFile::global, &file_size);
if(fp.getFileHandle())
{
LLVFile file(gVFS, file.mFileID, file.mFileType, LLVFile::WRITE);
LLVFile file(gVFS, asset_id, asset_type, LLVFile::WRITE);
file.setMaxSize(file_size);
const S32 buf_size = 65536;
U8 copy_buf[buf_size];
@@ -217,7 +219,7 @@ void LLFloaterVFS::setEditEnabled(bool enabled)
childSetEnabled("type_combo", false); // DOESN'T WORK
childSetEnabled("copy_uuid_btn", enabled);
childSetEnabled("item_btn", enabled);
childSetEnabled("reload_btn", false); // DOESN'T WORK
childSetEnabled("reload_btn", enabled); // WORKS!
childSetEnabled("remove_btn", enabled);
}
// static