livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename fs_floater_vram_usage.xml to floater_fs_vram_usage.xml so it can actually be previewed in the XUI preview tool

Ansariel 2015-01-07 14:10:10 +01:00
parent 0c5678814e
commit 488f737fdf
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/newview/llviewerfloaterreg.cpp
View File

@ -176,6 +176,7 @@
#include "fsfloaterteleporthistory.h"
#include "fsfloatervoicecontrols.h"
#include "fsfloatervolumecontrols.h"
#include "fsfloatervramusage.h"
#include "fsfloaterwsassetblacklist.h"
#include "fsmoneytracker.h"
#include "fspanelclassified.h"
@ -188,8 +189,6 @@
#include "particleeditor.h"
#include "quickprefs.h"
#include "fsfloatervramusage.h"
// handle secondlife:///app/openfloater/{NAME} URLs
class LLFloaterOpenHandler : public LLCommandHandler
{
@ -428,9 +427,8 @@ void LLViewerFloaterReg::registerFloaters()
LLFloaterReg::add("secondary_inventory", "floater_my_inventory.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSidePanelContainer>);
LLFloaterReg::add("script_recover", "floater_script_recover.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterScriptRecover>);
LLFloaterReg::add("sound_explorer", "floater_NACL_explore_sounds.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<NACLFloaterExploreSounds>);
LLFloaterReg::add( "vram_usage", "floater_fs_vram_usage.xml", static_cast<LLFloaterBuildFunc>( &LLFloaterReg::build< FSFloaterVRAMUsage >) );
LLFloaterReg::add("ws_asset_blacklist", "floater_asset_blacklist.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<FSFloaterWSAssetBlacklist>);
LLFloaterReg::add( "vram_usage", "fs_floater_vram_usage.xml", static_cast<LLFloaterBuildFunc>( &LLFloaterReg::build< FSFloaterVRAMUsage >) );
LLFloaterReg::registerControlVariables(); // Make sure visibility and rect controls get preserved when saving
}

4
indra/newview/skins/default/xui/en/fs_floater_vram_usage.xml → indra/newview/skins/default/xui/en/floater_fs_vram_usage.xml
View File

@ -51,11 +51,11 @@
dynamicwidth="true"/>
<column
name="vram_usage"
label="VRAM (Textures) in kb"
label="VRAM (Textures) in KB"
dynamicwidth="true"/>
<column
name="vram_usage_vbo"
label="VRAM (VBO) in kb"
label="VRAM (VBO) in KB"
dynamicwidth="true"/>
</scroll_list>
<button