diff options
| author | Callum Prentice <callum@lindenlab.com> | 2014-06-02 11:23:22 -0700 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2014-06-02 11:23:22 -0700 |
| commit | 5f0eefdf2d6ead9e5df7476073185a530b06b9d4 (patch) | |
| tree | 37286dd1e1db7f3d13c1906aed26990c624b4abc /indra/newview/skins/default/xui/en | |
| parent | 038f250caea80e21192372019dca8fdcf269c0d9 (diff) | |
MAINT-4121 FIX duplicated IDs for XUI in repo: callum_linden/viewer-release-nui-login
Diffstat (limited to 'indra/newview/skins/default/xui/en')
| -rwxr-xr-x | indra/newview/skins/default/xui/en/floater_stats.xml | 4 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_login_first.xml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_stats.xml b/indra/newview/skins/default/xui/en/floater_stats.xml index bee570d5d0..7addc71f52 100755 --- a/indra/newview/skins/default/xui/en/floater_stats.xml +++ b/indra/newview/skins/default/xui/en/floater_stats.xml @@ -59,10 +59,10 @@ <stat_bar name="ktrissec" label="KTris per Sec" stat="trianglesdrawnstat"/> - <stat_bar name="objs" + <stat_bar name="totalobjs" label="Total Objects" stat="numobjectsstat"/> - <stat_bar name="objs" + <stat_bar name="cachedobjs" label="Cached Objects" stat="numactivecachedobjects"/> <stat_bar name="newobjs" diff --git a/indra/newview/skins/default/xui/en/panel_login_first.xml b/indra/newview/skins/default/xui/en/panel_login_first.xml index 0c67103e58..994e6e63da 100644 --- a/indra/newview/skins/default/xui/en/panel_login_first.xml +++ b/indra/newview/skins/default/xui/en/panel_login_first.xml @@ -238,7 +238,7 @@ font="SansSerifLarge"
text_color="White"
height="64"
- name="image_caption_left"
+ name="image_caption_right"
left="432"
halign="center"
top="408"
|