diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-10-12 10:46:47 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-10-12 10:46:47 -0700 |
| commit | 0f7ca61386e4cf0f9efda7c380c40cc608f26ea3 (patch) | |
| tree | 5fb51a7ab9416ba40cd7a09b054f53cae707941e /indra/newview/skins/default/xui/en | |
| parent | f1c41c7945456e0647fac3ae631034cf1ffb0e65 (diff) | |
| parent | f01ba3cf29b45ed312cc7f383a60819b1a8026c6 (diff) | |
Merge
Diffstat (limited to 'indra/newview/skins/default/xui/en')
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_edit_profile.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_profile_view.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_edit_profile.xml b/indra/newview/skins/default/xui/en/panel_edit_profile.xml index d216bd9b2e..70c7bae662 100644 --- a/indra/newview/skins/default/xui/en/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/en/panel_edit_profile.xml @@ -93,7 +93,7 @@ height="13" layout="topleft" left="10" - name="user_label" + name="display_name_label" text_color="LtGray" value="Display Name:" width="80" /> diff --git a/indra/newview/skins/default/xui/en/panel_profile_view.xml b/indra/newview/skins/default/xui/en/panel_profile_view.xml index 406ec775a5..dc5173867b 100644 --- a/indra/newview/skins/default/xui/en/panel_profile_view.xml +++ b/indra/newview/skins/default/xui/en/panel_profile_view.xml @@ -34,7 +34,7 @@ height="13" layout="topleft" left="45" - name="user_label" + name="display_name_label" text_color="LtGray" value="Display Name:" width="80" /> |