summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml
diff options
context:
space:
mode:
authorRichard Nelson <richard@lindenlab.com>2009-08-24 20:04:52 +0000
committerRichard Nelson <richard@lindenlab.com>2009-08-24 20:04:52 +0000
commit138bf1132262c479dbbd5c95195db46b1efd065f (patch)
treebe2286f245865008b4ca6d738194133542822d65 /indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml
parentc2619694fd2f94ad7da2d6e936494f4c16601212 (diff)
merge -r 130399-131510 skinning-21 -> viewer-2.0.0-3
DEV-11254 DEV-11254 DEV-2003: DEV-21567 DEV-37301 EXT-104 EXT-138 EXT-217 EXT-256 EXT-259 EXT-259 EXT-328 EXT-348 EXT-386 EXT-399 EXT-403 EXT-460 EXT-492 EXT-492 EXT-531 EXT-537 EXT-684 improved text editor (handles multiple fonts simultaneously as well as inline widgets)
Diffstat (limited to 'indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml')
-rw-r--r--indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml b/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml
index 960c4e81e5..4f2261c953 100644
--- a/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml
+++ b/indra/newview/skins/default/xui/en/widgets/simple_text_editor.xml
@@ -9,14 +9,14 @@
word_wrap="false"
ignore_tab="true"
track_bottom="false"
- takes_non_scroll_clicks="true"
cursor_color="TextCursorColor"
default_color="TextDefaultColor"
text_color="TextFgColor"
text_readonly_color="TextFgReadOnlyColor"
bg_readonly_color="TextBgReadOnlyColor"
bg_writeable_color="TextBgWriteableColor"
- bg_focus_color="TextBgFocusColor">
+ bg_focus_color="TextBgFocusColor"
+ link_color="HTMLLinkColor">
<simple_text_editor.border
bevel_style="in"
follows="all" />