summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-10-01 13:47:15 -0700
committerRichard Linden <none@none>2013-10-01 13:47:15 -0700
commit9e486f6c6abbee6cb41ba9a6271d8a025ad924ef (patch)
treee6a8d1de4fc9fa4e8eff575d4ab430f7a72a4170 /indra/newview/skins/default/xui/en
parent1aa9ad575488eb1f808f3bfcb5f0ffa1e8e95591 (diff)
parent12f0f8cb72f789e21b01b45063dcc5f1f5292087 (diff)
Automated merge with http://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra/newview/skins/default/xui/en')
-rwxr-xr-xindra/newview/skins/default/xui/en/floater_stats.xml37
1 files changed, 22 insertions, 15 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_stats.xml b/indra/newview/skins/default/xui/en/floater_stats.xml
index f0a464dfc9..d4decf383d 100755
--- a/indra/newview/skins/default/xui/en/floater_stats.xml
+++ b/indra/newview/skins/default/xui/en/floater_stats.xml
@@ -111,25 +111,32 @@
<stat_view name="memory"
label="Memory Usage">
<stat_bar name="LLView"
- label="LLView Memory"
- stat="class LLView"
- show_history="true"/>
+ label="UI"
+ stat="LLView"/>
+ <stat_bar name="LLFontFreetype"
+ label="Fonts"
+ stat="LLFontFreetype"/>
+ <stat_bar name="LLInventoryObject"
+ label="Inventory"
+ stat="LLInventoryObject"/>
<stat_bar name="LLViewerObject"
- label="LLViewerObject Memory"
- stat="class LLViewerObject"
- show_history="true"/>
+ label="Viewer Objects"
+ stat="LLViewerObject"/>
<stat_bar name="LLVOCacheEntry"
- label="LLVOCacheEntry Memory"
- stat="class LLVOCacheEntry"
- show_history="true"/>
+ label="Viewer Object Cache"
+ stat="LLVOCacheEntry"/>
<stat_bar name="LLDrawable"
- label="LLDrawable Memory"
- stat="class LLDrawable"
- show_history="true"/>
+ label="Drawables"
+ stat="LLDrawable"/>
<stat_bar name="LLImage"
- label="LLImage Memory"
- stat="class LLImageBase"
- show_history="true"/>
+ label="Image Data"
+ stat="LLImage"/>
+ <stat_bar name="LLImageGL"
+ label="GL Image Data"
+ stat="LLImageGL"/>
+ <stat_bar name="LLVertexBuffer"
+ label="Vertex Buffers"
+ stat="LLVertexBuffer"/>
</stat_view>
<stat_view name="network"
label="Network"