--- trunk/linden/indra/newview/llprefsim.cpp	2009/05/04 18:15:39	133
+++ trunk/linden/indra/newview/llprefsim.cpp	2009/05/06 20:32:39	134
@@ -40,6 +40,7 @@
 #include "lltexteditor.h"
 #include "llavatarconstants.h"
 #include "llagent.h"
+#include "llversionviewer.h"
 #include "llviewercontrol.h"
 #include "llviewernetwork.h"
 #include "lluictrlfactory.h"
@@ -171,16 +172,18 @@
 		gSavedSettings.setBOOL("IMShowTimestamps", childGetValue("show_timestamps_check").asBoolean());
 		gSavedSettings.setBOOL("ChatOnlineNotification", childGetValue("friends_online_notify_checkbox").asBoolean());
 		
-		gSavedPerAccountSettings.setString("InstantMessageLogPath", childGetText("log_path_string"));
+#if !FORCE_LOG_CHAT_IM
 		gSavedPerAccountSettings.setBOOL("LogInstantMessages",childGetValue("log_instant_messages").asBoolean());
 		gSavedPerAccountSettings.setBOOL("LogChat",childGetValue("log_chat").asBoolean());
 		gSavedPerAccountSettings.setBOOL("LogShowHistory",childGetValue("log_show_history").asBoolean());
 		gSavedPerAccountSettings.setBOOL("IMLogTimestamp",childGetValue("log_instant_messages_timestamp").asBoolean());
 		gSavedPerAccountSettings.setBOOL("LogChatTimestamp",childGetValue("log_chat_timestamp").asBoolean());
-		gSavedPerAccountSettings.setBOOL("LogChatIM",childGetValue("log_chat_IM").asBoolean());
 		gSavedPerAccountSettings.setBOOL("LogTimestampDate",childGetValue("log_date_timestamp").asBoolean());
+#endif
+        gSavedPerAccountSettings.setBOOL("LogChatIM",childGetValue("log_chat_IM").asBoolean());
 
-		gDirUtilp->setChatLogsDir(gSavedPerAccountSettings.getString("InstantMessageLogPath"));
+        gSavedPerAccountSettings.setString("InstantMessageLogPath", childGetText("log_path_string"));
+        gDirUtilp->setChatLogsDir(gSavedPerAccountSettings.getString("InstantMessageLogPath"));
 
 		gDirUtilp->setPerAccountChatLogsDir(gSavedSettings.getString("FirstName"), 
 											gSavedSettings.getString("LastName") );
@@ -246,8 +249,6 @@
 	childSetLabelArg("online_visibility", "[DIR_VIS]", mDirectoryVisibility);
 	childEnable("send_im_to_email");
 	childSetValue("send_im_to_email", im_via_email);
-	childEnable("log_instant_messages");
-	childEnable("log_chat");
 	childEnable("busy_response");
 //MK
 	if (RRenabled && gAgent.mRRInterface.contains ("sendim"))
@@ -255,10 +256,15 @@
 		childDisable("busy_response");
 	}
 //mk
-	childEnable("log_instant_messages_timestamp");
+
+#if !FORCE_LOG_CHAT_IM
+    childEnable("log_instant_messages");
+    childEnable("log_chat");
+    childEnable("log_instant_messages_timestamp");
 	childEnable("log_chat_timestamp");
-	childEnable("log_chat_IM");
 	childEnable("log_date_timestamp");
+#endif
+    childEnable("log_chat_IM");
 	
 	//RN: get wide string so replace char can work (requires fixed-width encoding)
 	LLWString busy_response = utf8str_to_wstring( gSavedPerAccountSettings.getString("BusyModeResponse") );