diff options
| author | Monroe Linden <monroe@lindenlab.com> | 2010-07-15 16:32:50 -0700 |
|---|---|---|
| committer | Monroe Linden <monroe@lindenlab.com> | 2010-07-15 16:32:50 -0700 |
| commit | 551f74125bacfe8353a4b13692d2fdb0cc29958b (patch) | |
| tree | dd88ed62b786f891ad48d4302b4fdb3fea4fdf19 /indra/newview | |
| parent | 39f241aad283d2f051ae7f093bbd650f16486df0 (diff) | |
Changes to allow disabling an LLTextBox (or LLTextBox subclass) to gray out the text.
Due to some legacy issues, text boxes will not gray out on disable unless they have their text_readonly_color property in xui set to "LabelDisabledColor" (or some other color distinct from their text color).
Reviewed by Richard.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/skins/default/xui/en/widgets/text.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/widgets/text_editor.xml | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/widgets/text.xml b/indra/newview/skins/default/xui/en/widgets/text.xml index 3006df22b8..3fa3f3eb90 100644 --- a/indra/newview/skins/default/xui/en/widgets/text.xml +++ b/indra/newview/skins/default/xui/en/widgets/text.xml @@ -8,7 +8,7 @@ halign="left" h_pad="0" allow_scroll="false" - text_readonly_color="LabelDisabledColor" + text_readonly_color="LabelTextColor" bg_writeable_color="FloaterDefaultBackgroundColor" use_ellipses="false" bg_visible="false" diff --git a/indra/newview/skins/default/xui/en/widgets/text_editor.xml b/indra/newview/skins/default/xui/en/widgets/text_editor.xml index 2ced8b1b4b..af2e17fc3f 100644 --- a/indra/newview/skins/default/xui/en/widgets/text_editor.xml +++ b/indra/newview/skins/default/xui/en/widgets/text_editor.xml @@ -2,4 +2,5 @@ <!-- Core parameters are in simple_text_editor.xml --> <text_editor allow_html="false" + text_readonly_color="LabelDisabledColor" show_context_menu="true"/> |