diff --git a/indra/newview/llviewerfloaterreg.cpp b/indra/newview/llviewerfloaterreg.cpp index 47d7e658cc..dcda17b211 100755 --- a/indra/newview/llviewerfloaterreg.cpp +++ b/indra/newview/llviewerfloaterreg.cpp @@ -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); LLFloaterReg::add("script_recover", "floater_script_recover.xml", (LLFloaterBuildFunc)&LLFloaterReg::build); LLFloaterReg::add("sound_explorer", "floater_NACL_explore_sounds.xml", (LLFloaterBuildFunc)&LLFloaterReg::build); + LLFloaterReg::add( "vram_usage", "floater_fs_vram_usage.xml", static_cast( &LLFloaterReg::build< FSFloaterVRAMUsage >) ); LLFloaterReg::add("ws_asset_blacklist", "floater_asset_blacklist.xml", (LLFloaterBuildFunc)&LLFloaterReg::build); - LLFloaterReg::add( "vram_usage", "fs_floater_vram_usage.xml", static_cast( &LLFloaterReg::build< FSFloaterVRAMUsage >) ); - LLFloaterReg::registerControlVariables(); // Make sure visibility and rect controls get preserved when saving } diff --git a/indra/newview/skins/default/xui/en/fs_floater_vram_usage.xml b/indra/newview/skins/default/xui/en/floater_fs_vram_usage.xml similarity index 95% rename from indra/newview/skins/default/xui/en/fs_floater_vram_usage.xml rename to indra/newview/skins/default/xui/en/floater_fs_vram_usage.xml index 63179d7aa6..99fb0cbd21 100644 --- a/indra/newview/skins/default/xui/en/fs_floater_vram_usage.xml +++ b/indra/newview/skins/default/xui/en/floater_fs_vram_usage.xml @@ -51,11 +51,11 @@ dynamicwidth="true"/>