summaryrefslogtreecommitdiff
path: root/indra/newview/skins
diff options
context:
space:
mode:
authorCinder <cinder.roxley@phoenixviewer.com>2014-04-18 12:52:07 -0600
committerCinder <cinder.roxley@phoenixviewer.com>2014-04-18 12:52:07 -0600
commit8c39617c9ac469a8635d511142148ad5a38de836 (patch)
tree591229faa57bc569504a27b2f14416e721ccc9c2 /indra/newview/skins
parent20a7d749cf8ea76c1481022f17153e72670b23ec (diff)
Begin moving script editor portions of LLTextEditor to their own derived class.
This should fix the run off segment bugs by not overriding LLTextBase::clearSegments() in LLTextEditor TODO: Move the rest of the script stuff out of LLTextEditor for simplicity sake
Diffstat (limited to 'indra/newview/skins')
-rwxr-xr-xindra/newview/skins/default/xui/en/panel_script_ed.xml4
-rw-r--r--indra/newview/skins/default/xui/en/script_editor.xml5
2 files changed, 7 insertions, 2 deletions
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 d1b35dce9d..3e88e2dc04 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"
@@ -165,7 +165,7 @@
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..d24833e85c
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/script_editor.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<script_editor
+ name="script_editor"
+ parse_urls="false">
+</script_editor>