summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMatthew Breindel (Falcon) <falcon@lindenlab.com>2010-08-26 17:14:22 -0700
committerMatthew Breindel (Falcon) <falcon@lindenlab.com>2010-08-26 17:14:22 -0700
commit72ad2e656e4b8db83995b77a627ecb214b7abb3e (patch)
treee9efc96828f988c2a272a9b2736023b73a5b8e6c /indra/newview
parent9db7d6cb3d216fcdc1b6528039dc6538b045819e (diff)
Fixed bad merge.
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/skins/default/xui/en/floater_region_debug_console.xml1
1 files changed, 0 insertions, 1 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 976fa35d3c..8bc62f8189 100644
--- a/indra/newview/skins/default/xui/en/floater_region_debug_console.xml
+++ b/indra/newview/skins/default/xui/en/floater_region_debug_console.xml
@@ -9,7 +9,6 @@
width="600">
<text_editor
left="10"
- read_only="true"
type="string"
length="1"
follows="left|top|right|bottom"