diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-04-23 11:53:05 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-04-23 11:53:05 -0400 |
| commit | 9353868d91dfe2c4539c81c0b96bfe9efb497b2c (patch) | |
| tree | f6362bc51afe7fe463718c603ccf756a86079067 /indra/newview/skins/default/xui/en | |
| parent | 5870788f68c6b1fb504ae95403e7da95bc55ed4c (diff) | |
| parent | b4ca93cadce90466d41704b68933c21fe909bcb8 (diff) | |
merge changes for STORM-1831
Diffstat (limited to 'indra/newview/skins/default/xui/en')
3 files changed, 10 insertions, 5 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_region_debug_console.xml b/indra/newview/skins/default/xui/en/floater_region_debug_console.xml index 99b812a880..11172d8a3e 100755 --- a/indra/newview/skins/default/xui/en/floater_region_debug_console.xml +++ b/indra/newview/skins/default/xui/en/floater_region_debug_console.xml @@ -21,7 +21,6 @@ layout="topleft" max_length="65536" name="region_debug_console_output" - show_line_numbers="false" word_wrap="true" track_end="true" read_only="true"> diff --git a/indra/newview/skins/default/xui/en/panel_script_ed.xml b/indra/newview/skins/default/xui/en/panel_script_ed.xml index bcdef96138..1a4f0aff73 100755 --- a/indra/newview/skins/default/xui/en/panel_script_ed.xml +++ b/indra/newview/skins/default/xui/en/panel_script_ed.xml @@ -148,7 +148,7 @@ name="Keyword Help..." /> </menu> </menu_bar> - <text_editor + <script_editor left="0" type="string" length="1" @@ -157,15 +157,14 @@ height="376" ignore_tab="false" layout="topleft" - max_length="65536" + max_length="262144" name="Script Editor" text_readonly_color="DkGray" width="487" - show_line_numbers="true" enable_tooltip_paste="true" word_wrap="true"> Loading... - </text_editor> + </script_editor> <scroll_list top_pad="10" left="0" diff --git a/indra/newview/skins/default/xui/en/script_editor.xml b/indra/newview/skins/default/xui/en/script_editor.xml new file mode 100644 index 0000000000..b030a117fc --- /dev/null +++ b/indra/newview/skins/default/xui/en/script_editor.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8" standalone="yes" ?> +<script_editor + name="script_editor" + parse_urls="false" + show_context_menu="true" + show_line_numbers="true"> +</script_editor> |