summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-03-21 10:57:38 -0400
committerOz Linden <oz@lindenlab.com>2013-03-21 10:57:38 -0400
commit50f199e45d0524b59fc9246a3160c5676c8d3942 (patch)
treee091467d64f4334459b5ca67239ed23d4059392a /indra/newview/skins/default/xui/en/panel_preferences_chat.xml
parentbf95c1cae7a84d1a97dacd8ea7f1b6af8be067a9 (diff)
parent43d7c80e8e2cd1cfe4e6c4214b4a4df9341d310b (diff)
merge changes for 3.5.0-beta4
Diffstat (limited to 'indra/newview/skins/default/xui/en/panel_preferences_chat.xml')
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_chat.xml1
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
index 9db3816c92..bd096ebb88 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_chat.xml
@@ -429,7 +429,6 @@
</text>
<line_editor
- enabled="false"
control_name="InstantMessageLogPath"
border_style="line"
border_thickness="1"