diff options
| author | Kent Quirk <q@lindenlab.com> | 2010-02-17 07:44:29 -0500 |
|---|---|---|
| committer | Kent Quirk <q@lindenlab.com> | 2010-02-17 07:44:29 -0500 |
| commit | c573679521bf260ec2e601eef7f0abf0deead2fd (patch) | |
| tree | 1e5dac6edb9b49fd68c2fec47a4a5235ab8ee064 /indra/newview/skins/default/xui | |
| parent | f6304197a755b4268e65d128c2695d6392d2bffd (diff) | |
| parent | 1a9cd13d79467f8e01a67a7e3c4d2111a33f218a (diff) | |
automated merge of overnight fixes from viewer-2-0 and viewer-hotfix
Diffstat (limited to 'indra/newview/skins/default/xui')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_tools.xml | 3 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/inspect_avatar.xml | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index 23203d227e..d989282b9f 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -2785,6 +2785,9 @@ even though the user gets a free copy. name="button permissions" width="130" /> <panel_inventory_object + border="true" + border_visible="true" + bevel_style="in" follows="left|top" height="325" layout="topleft" diff --git a/indra/newview/skins/default/xui/en/inspect_avatar.xml b/indra/newview/skins/default/xui/en/inspect_avatar.xml index 9796f7b5b6..194ae151d2 100644 --- a/indra/newview/skins/default/xui/en/inspect_avatar.xml +++ b/indra/newview/skins/default/xui/en/inspect_avatar.xml @@ -123,7 +123,7 @@ <button follows="top|left" height="20" - label="More" + label="Profile" layout="topleft" name="view_profile_btn" left_delta="96" |