diff options
author | Merov Linden <merov@lindenlab.com> | 2010-11-04 18:09:35 -0700 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2010-11-04 18:09:35 -0700 |
commit | ba3307b8d0f2ceb40454174a6593f3f98ce98b65 (patch) | |
tree | 7c016ab72795543361d206de5344b34a6a823fdf /indra/newview/skins/default/xui/en/widgets | |
parent | dac53830f1a67c8657ced9c39eccedbadf149bd9 (diff) | |
parent | 40979589afc5c91cab977307a1e400315b1c8a8f (diff) |
merge with STORM-105
Diffstat (limited to 'indra/newview/skins/default/xui/en/widgets')
-rw-r--r-- | indra/newview/skins/default/xui/en/widgets/chat_history.xml | 1 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/widgets/inspector.xml | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/skins/default/xui/en/widgets/chat_history.xml b/indra/newview/skins/default/xui/en/widgets/chat_history.xml index ef885e8045..c0a948931c 100644 --- a/indra/newview/skins/default/xui/en/widgets/chat_history.xml +++ b/indra/newview/skins/default/xui/en/widgets/chat_history.xml @@ -19,6 +19,7 @@ font="SansSerif"> <more_chat_text mouse_opaque="true" + parse_urls="false" word_wrap="true" /> </chat_history>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/widgets/inspector.xml b/indra/newview/skins/default/xui/en/widgets/inspector.xml index 428b2ce03b..8c171c387f 100644 --- a/indra/newview/skins/default/xui/en/widgets/inspector.xml +++ b/indra/newview/skins/default/xui/en/widgets/inspector.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <inspector name="inspector" + max_width="300" bg_opaque_color="DkGray_66" background_visible="true" bg_opaque_image="Inspector_Hover" |