summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorrichard <none@none>2010-01-15 13:16:58 -0800
committerrichard <none@none>2010-01-15 13:16:58 -0800
commitcf2beaeea6d4ccd8a0a0448660ddd120aeed5823 (patch)
tree98c959672debae3fc86e2afe7d924d8d15253317 /indra/newview
parentc9cf84913d306103da51dc83e5932ff3fb308d32 (diff)
EXT-4380 - LLTextEditor: line_spacing.multiple option doesn't work well with "widgeted" text
partial fix reviewed by Leyla
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/skins/default/xui/en/widgets/chat_history.xml22
1 files changed, 12 insertions, 10 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 8785dff2ae..f6d1992c8e 100644
--- a/indra/newview/skins/default/xui/en/widgets/chat_history.xml
+++ b/indra/newview/skins/default/xui/en/widgets/chat_history.xml
@@ -1,23 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<chat_history
- message_header="panel_chat_header.xml"
- message_separator="panel_chat_separator.xml"
- left_text_pad="10"
- right_text_pad="15"
- left_widget_pad="0"
- right_widget_pad="10"
- top_separator_pad="5"
- bottom_separator_pad="5"
- top_header_pad="17"
- bottom_header_pad="10"
+ message_header="panel_chat_header.xml"
+ message_separator="panel_chat_separator.xml"
+ left_text_pad="10"
+ right_text_pad="15"
+ left_widget_pad="0"
+ right_widget_pad="10"
+ top_separator_pad="2"
+ bottom_separator_pad="2"
+ top_header_pad="12"
+ bottom_header_pad="5"
max_length="2147483647"
track_bottom="true"
name="chat_history"
type="string"
word_wrap="true"
+ line_spacing.multiple="1.0"
font="SansSerif">
<more_chat_text
mouse_opaque="true"
word_wrap="true"
/>
</chat_history>
+enabledcontrol \ No newline at end of file