diff options
author | Oz Linden <oz@lindenlab.com> | 2010-11-12 14:15:21 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2010-11-12 14:15:21 -0500 |
commit | 4839e79b20679560f697af96c11db4aef7e1d740 (patch) | |
tree | ea5faa6268fbe23de23ee03ee43d367181fba5c9 /indra/newview/skins/default | |
parent | 5b86f60a13f28f5978ff3a53371cb3bae7f0d837 (diff) | |
parent | 2632565bbced3002eb9912270b1f7303c48a0b44 (diff) |
merge STORM-102 to latest viewer-development prior to pull
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_privacy.xml | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml index b396eba0b4..2ddb81559f 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml @@ -114,16 +114,17 @@ name="show_timestamps_check_im" top_pad="10" width="237" /> - <check_box - enabled="false" + <check_box + control_name="LogFileNamewithDate" + enabled="false" height="16" - label="Add datestamp to log file name" + label="Add datestamp to log file name." layout="topleft" - left_delta="0" - name="show_datestamps_check_im" + left_detla="5" + name="logfile_name_datestamp" top_pad="10" - width="237" /> - <text + width="350"/> + <text type="string" length="1" follows="left|top" |