diff options
| author | David Seikel | 2011-02-20 20:31:57 +1000 |
|---|---|---|
| committer | David Seikel | 2011-02-20 20:31:57 +1000 |
| commit | d6666d0776985bada40f19c623b86d82a4113f92 (patch) | |
| tree | eb4d234a313c51b40f6d53d4a59bdc831a7cd0fc /linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml | |
| parent | Remove catering to LL's probably illegal attempt to block copying of open sou... (diff) | |
| parent | Reduce the logging spam to warnings. Debug was too much. (diff) | |
| download | meta-impy-d6666d0776985bada40f19c623b86d82a4113f92.zip meta-impy-d6666d0776985bada40f19c623b86d82a4113f92.tar.gz meta-impy-d6666d0776985bada40f19c623b86d82a4113f92.tar.bz2 meta-impy-d6666d0776985bada40f19c623b86d82a4113f92.tar.xz | |
Merge branch 'weekly' into branding
Conflicts (solved):
linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
linden/indra/newview/llappviewer.cpp
linden/indra/newview/llappviewerwin32.cpp
Diffstat (limited to 'linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml')
| -rw-r--r-- | linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml b/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml index 38c5a98..2db2595 100644 --- a/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml +++ b/linden/indra/newview/skins/default/xui/en-us/panel_avatar.xml | |||
| @@ -127,6 +127,11 @@ | |||
| 127 | font="SansSerifSmall" height="16" is_unicode="false" left="12" | 127 | font="SansSerifSmall" height="16" is_unicode="false" left="12" |
| 128 | max_length="254" mouse_opaque="false" name="name" | 128 | max_length="254" mouse_opaque="false" name="name" |
| 129 | width="155" /> | 129 | width="155" /> |
| 130 | <name_editor bevel_style="in" border_style="line" visible="false" | ||
| 131 | border_thickness="1" bottom="-24" enabled="false" follows="left|top" | ||
| 132 | font="SansSerifSmall" height="16" is_unicode="false" left_delta="0" | ||
| 133 | max_length="254" mouse_opaque="false" name="complete_name" | ||
| 134 | width="155" /> | ||
| 130 | <button bottom_delta="0" font="SansSerif" halign="center" height="20" | 135 | <button bottom_delta="0" font="SansSerif" halign="center" height="20" |
| 131 | label="Copy Key" label_selected="Copy Key" | 136 | label="Copy Key" label_selected="Copy Key" |
| 132 | left_delta="157" mouse_opaque="true" name="btn_copy_uuid" width="80" /> | 137 | left_delta="157" mouse_opaque="true" name="btn_copy_uuid" width="80" /> |