diff options
author | Samuel Kolb <skolb@lindenlab.com> | 2009-12-16 13:57:11 -0800 |
---|---|---|
committer | Samuel Kolb <skolb@lindenlab.com> | 2009-12-16 13:57:11 -0800 |
commit | d3ca545687945054c666359e78ada94949732205 (patch) | |
tree | 3751b2add8082693d4a6a1255fc0a46e1deacca3 /indra/newview | |
parent | 0d0e0852445444b9a129baf20f68d81488a1fa5e (diff) | |
parent | c50d86d37074b9908736050c7fca1196e7ef6ccc (diff) |
local merge
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/skins/default/xui/en/floater_tools.xml | 1 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/inspect_object.xml | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index 5e68850e30..f2a5d902e7 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -2676,6 +2676,7 @@ even though the user gets a free copy. height="18" layout="topleft" left="10" + use_ellipsis="true" read_only="true" name="media_info" width="180" /> diff --git a/indra/newview/skins/default/xui/en/inspect_object.xml b/indra/newview/skins/default/xui/en/inspect_object.xml index cedf83f8b1..00e00b9694 100644 --- a/indra/newview/skins/default/xui/en/inspect_object.xml +++ b/indra/newview/skins/default/xui/en/inspect_object.xml @@ -92,8 +92,8 @@ This is a really long description for an object being as how it is at least 80 c height="13" left_delta="0" name="object_media_url" - top_pad="-1" - width="291" + bottom_pad="2" + width="200" max_length = "50" use_ellipses="true"> http://www.superdupertest.com |