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

Wed, 07 Jan 2015 14:10:10 +0100

author
Ansariel
date
Wed, 07 Jan 2015 14:10:10 +0100
changeset 43108
d905bf006059
parent 43107
f6a5c7440b7c
child 43109
fa58f92af4c9

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

indra/newview/llviewerfloaterreg.cpp file | annotate | diff | revisions
indra/newview/skins/default/xui/en/floater_fs_vram_usage.xml file | annotate | diff | revisions
indra/newview/skins/default/xui/en/fs_floater_vram_usage.xml file | annotate | diff | revisions
     1.1 --- a/indra/newview/llviewerfloaterreg.cpp	Wed Jan 07 13:23:22 2015 +0100
     1.2 +++ b/indra/newview/llviewerfloaterreg.cpp	Wed Jan 07 14:10:10 2015 +0100
     1.3 @@ -176,6 +176,7 @@
     1.4  #include "fsfloaterteleporthistory.h"
     1.5  #include "fsfloatervoicecontrols.h"
     1.6  #include "fsfloatervolumecontrols.h"
     1.7 +#include "fsfloatervramusage.h"
     1.8  #include "fsfloaterwsassetblacklist.h"
     1.9  #include "fsmoneytracker.h"
    1.10  #include "fspanelclassified.h"
    1.11 @@ -188,8 +189,6 @@
    1.12  #include "particleeditor.h"
    1.13  #include "quickprefs.h"
    1.14  
    1.15 -#include "fsfloatervramusage.h"
    1.16 -
    1.17  // handle secondlife:///app/openfloater/{NAME} URLs
    1.18  class LLFloaterOpenHandler : public LLCommandHandler
    1.19  {
    1.20 @@ -428,9 +427,8 @@
    1.21  	LLFloaterReg::add("secondary_inventory", "floater_my_inventory.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterSidePanelContainer>);
    1.22  	LLFloaterReg::add("script_recover", "floater_script_recover.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterScriptRecover>);
    1.23  	LLFloaterReg::add("sound_explorer", "floater_NACL_explore_sounds.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<NACLFloaterExploreSounds>);
    1.24 +	LLFloaterReg::add( "vram_usage", "floater_fs_vram_usage.xml", static_cast<LLFloaterBuildFunc>( &LLFloaterReg::build< FSFloaterVRAMUsage >) );
    1.25  	LLFloaterReg::add("ws_asset_blacklist", "floater_asset_blacklist.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<FSFloaterWSAssetBlacklist>);
    1.26  
    1.27 -	LLFloaterReg::add( "vram_usage", "fs_floater_vram_usage.xml", static_cast<LLFloaterBuildFunc>( &LLFloaterReg::build< FSFloaterVRAMUsage >) );
    1.28 -
    1.29  	LLFloaterReg::registerControlVariables(); // Make sure visibility and rect controls get preserved when saving
    1.30  }
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/indra/newview/skins/default/xui/en/floater_fs_vram_usage.xml	Wed Jan 07 14:10:10 2015 +0100
     2.3 @@ -0,0 +1,73 @@
     2.4 +<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
     2.5 +<floater
     2.6 + positioning="centered"
     2.7 + legacy_header_height="18"
     2.8 + can_resize="true"
     2.9 + default_tab_group="1"
    2.10 + height="350"
    2.11 + layout="topleft"
    2.12 + min_height="160"
    2.13 + min_width="270"
    2.14 + name="object_vram_usage"
    2.15 + help_topic=""
    2.16 + save_rect="true"
    2.17 + title="Object impact on VRAM"
    2.18 + width="400">
    2.19 +    <scroll_list
    2.20 +        name="result_list"
    2.21 +        left="10"
    2.22 +        right="-10"
    2.23 +        top="14"
    2.24 +        bottom="-32"
    2.25 +        follows="left|top|bottom|right"
    2.26 +        can_resize="true"
    2.27 +        column_padding="0"
    2.28 +        draw_heading="true"
    2.29 +        multi_select="false"
    2.30 +        search_column="6">
    2.31 +      <column
    2.32 +          name="uuid"
    2.33 +          label="uuid"
    2.34 +		  width="0"/>
    2.35 +      <column
    2.36 +          name="name"
    2.37 +          label="Name"
    2.38 +          dynamicwidth="true"/>
    2.39 +      <column
    2.40 +          name="distance"
    2.41 +          label="Distance"
    2.42 +          dynamicwidth="true"/>
    2.43 +      <column
    2.44 +          name="faces"
    2.45 +          label="Faces"
    2.46 +          dynamicwidth="true"/>
    2.47 +      <column
    2.48 +          name="vertices"
    2.49 +          label="Vertices"
    2.50 +          dynamicwidth="true"/>
    2.51 +      <column
    2.52 +          name="indices"
    2.53 +          label="Indices"
    2.54 +          dynamicwidth="true"/>
    2.55 +      <column
    2.56 +          name="vram_usage"
    2.57 +          label="VRAM (Textures) in KB"
    2.58 +          dynamicwidth="true"/>
    2.59 +      <column
    2.60 +          name="vram_usage_vbo"
    2.61 +          label="VRAM (VBO) in KB"
    2.62 +          dynamicwidth="true"/>
    2.63 +    </scroll_list>
    2.64 +    <button
    2.65 +     follows="bottom|left"
    2.66 +	 left="10"
    2.67 +	 top="-25"
    2.68 +     height="23"
    2.69 +     label="Refresh"
    2.70 +     label_selected="Refresh"
    2.71 +     layout="topleft"
    2.72 +     left_pad="10"
    2.73 +     name="refresh_button"
    2.74 +     width="120">
    2.75 +    </button>
    2.76 +</floater>
     3.1 --- a/indra/newview/skins/default/xui/en/fs_floater_vram_usage.xml	Wed Jan 07 13:23:22 2015 +0100
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,73 +0,0 @@
     3.4 -<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
     3.5 -<floater
     3.6 - positioning="centered"
     3.7 - legacy_header_height="18"
     3.8 - can_resize="true"
     3.9 - default_tab_group="1"
    3.10 - height="350"
    3.11 - layout="topleft"
    3.12 - min_height="160"
    3.13 - min_width="270"
    3.14 - name="object_vram_usage"
    3.15 - help_topic=""
    3.16 - save_rect="true"
    3.17 - title="Object impact on VRAM"
    3.18 - width="400">
    3.19 -    <scroll_list
    3.20 -        name="result_list"
    3.21 -        left="10"
    3.22 -        right="-10"
    3.23 -        top="14"
    3.24 -        bottom="-32"
    3.25 -        follows="left|top|bottom|right"
    3.26 -        can_resize="true"
    3.27 -        column_padding="0"
    3.28 -        draw_heading="true"
    3.29 -        multi_select="false"
    3.30 -        search_column="6">
    3.31 -      <column
    3.32 -          name="uuid"
    3.33 -          label="uuid"
    3.34 -		  width="0"/>
    3.35 -      <column
    3.36 -          name="name"
    3.37 -          label="Name"
    3.38 -          dynamicwidth="true"/>
    3.39 -      <column
    3.40 -          name="distance"
    3.41 -          label="Distance"
    3.42 -          dynamicwidth="true"/>
    3.43 -      <column
    3.44 -          name="faces"
    3.45 -          label="Faces"
    3.46 -          dynamicwidth="true"/>
    3.47 -      <column
    3.48 -          name="vertices"
    3.49 -          label="Vertices"
    3.50 -          dynamicwidth="true"/>
    3.51 -      <column
    3.52 -          name="indices"
    3.53 -          label="Indices"
    3.54 -          dynamicwidth="true"/>
    3.55 -      <column
    3.56 -          name="vram_usage"
    3.57 -          label="VRAM (Textures) in kb"
    3.58 -          dynamicwidth="true"/>
    3.59 -      <column
    3.60 -          name="vram_usage_vbo"
    3.61 -          label="VRAM (VBO) in kb"
    3.62 -          dynamicwidth="true"/>
    3.63 -    </scroll_list>
    3.64 -    <button
    3.65 -     follows="bottom|left"
    3.66 -	 left="10"
    3.67 -	 top="-25"
    3.68 -     height="23"
    3.69 -     label="Refresh"
    3.70 -     label_selected="Refresh"
    3.71 -     layout="topleft"
    3.72 -     left_pad="10"
    3.73 -     name="refresh_button"
    3.74 -     width="120">
    3.75 -    </button>
    3.76 -</floater>

mercurial