From 7c89e565b373803b64cabaac3695ac3e93469962 Mon Sep 17 00:00:00 2001
From: Wolfpup Lowenhar <wolfpup67@earthlink.net>
Date: Tue, 26 Oct 2010 20:02:07 -0400
Subject: This is the setting of the core file name date stamp code  and
 settings files for  Chat, Group and IM Logs.

--HG--
branch : storm-102
---
 .../skins/default/xui/en/panel_preferences_privacy.xml       | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default')

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 4ebd4c76f8..efe08ed885 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
@@ -114,7 +114,17 @@
      name="show_timestamps_check_im"
      top_pad="10"
      width="237" />
-    <text
+	<check_box
+     control_name="LogFileNamewithDate"
+     enabled="false"
+     height="16"
+     label="Add datestamp to log file name."
+     layout="topleft"
+     left_detla="5"
+     name="logfile_name_datestamp"
+     top_pad="10"
+     width="350"/>
+	<text
      type="string"
      length="1"
      follows="left|top"
-- 
cgit v1.2.3


From b7afbcbc97ed06dd6845d3850633f2eda494940c Mon Sep 17 00:00:00 2001
From: Seth ProductEngine <slitovchuk@productengine.com>
Date: Thu, 11 Nov 2010 00:17:59 +0200
Subject: STORM-578 FIXED SLURL to object or user name in nearby chat toast now
 uses the font color selected in Preferences->Chat. Removed unused
 "ChatToastAgentNameColor" setting from colors.xml.

---
 indra/newview/skins/default/colors.xml | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/colors.xml b/indra/newview/skins/default/colors.xml
index ddd2ff196b..f8660419b4 100644
--- a/indra/newview/skins/default/colors.xml
+++ b/indra/newview/skins/default/colors.xml
@@ -766,9 +766,6 @@
     <color
      name="SysWellItemSelected"
      value="0.3 0.3 0.3 1.0" />
-    <color
-     name="ChatToastAgentNameColor"
-     reference="EmphasisColor" />
     <color
     name="ColorSwatchBorderColor"
     value="0.45098 0.517647 0.607843 1"/>
-- 
cgit v1.2.3