diff options
| author | Aimee Linden <aimee@lindenlab.com> | 2010-02-05 16:23:13 +0000 |
|---|---|---|
| committer | Aimee Linden <aimee@lindenlab.com> | 2010-02-05 16:23:13 +0000 |
| commit | fc9099a0faef9f077b7986651f953998d6b9ac0c (patch) | |
| tree | d192c0e25d250c20faae00519ce3decb0d099340 /indra/newview/skins/default/xui/en/widgets | |
| parent | da44a78e6a899324ca9dad6bae6e0d6fc8b73dcb (diff) | |
| parent | 166ac89de9bcf951103cbf2551a133ebe9e43035 (diff) | |
merge
Diffstat (limited to 'indra/newview/skins/default/xui/en/widgets')
| -rw-r--r-- | indra/newview/skins/default/xui/en/widgets/tab_container.xml | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/widgets/text_editor.xml | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/widgets/tab_container.xml b/indra/newview/skins/default/xui/en/widgets/tab_container.xml index 597c4e83b6..4a163fc1e3 100644 --- a/indra/newview/skins/default/xui/en/widgets/tab_container.xml +++ b/indra/newview/skins/default/xui/en/widgets/tab_container.xml @@ -5,6 +5,7 @@ label_pad_left - padding to the left of tab button labels --> <tab_container tab_min_width="60" tab_max_width="150" + use_custom_icon_ctrl="false" halign="center" font="SansSerifSmall" tab_height="21" 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 23ca8ea338..2ced8b1b4b 100644 --- a/indra/newview/skins/default/xui/en/widgets/text_editor.xml +++ b/indra/newview/skins/default/xui/en/widgets/text_editor.xml @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <!-- Core parameters are in simple_text_editor.xml --> <text_editor - allow_html="false"/> + allow_html="false" + show_context_menu="true"/> |