1 files changed, 4 insertions, 0 deletions

diff --git a/linden/indra/newview/llprefsim.cpp b/linden/indra/newview/llprefsim.cpp
index 0548287..4daead0 100644
--- a/linden/indra/newview/llprefsim.cpp
+++ b/linden/indra/newview/llprefsim.cpp
@@ -98,6 +98,7 @@ BOOL LLPrefsIMImpl::postBuild()
 
         // Don't enable this until we get personal data
         childDisable("include_im_in_chat_console");
+        childDisable("include_im_in_chat_history");
         childDisable("show_timestamps_check");
         childDisable("friends_online_notify_checkbox");
         
@@ -116,6 +117,7 @@ BOOL LLPrefsIMImpl::postBuild()
         childSetText("busy_response", getString("log_in_to_change"));
 
         childSetValue("include_im_in_chat_console", gSavedSettings.getBOOL("IMInChatConsole"));
+        childSetValue("include_im_in_chat_history", gSavedSettings.getBOOL("IMInChatHistory"));
         childSetValue("show_timestamps_check", gSavedSettings.getBOOL("IMShowTimestamps"));
         childSetValue("friends_online_notify_checkbox", gSavedSettings.getBOOL("ChatOnlineNotification"));
 
@@ -165,6 +167,7 @@ void LLPrefsIMImpl::apply()
                 gSavedPerAccountSettings.setString("BusyModeResponse", std::string(wstring_to_utf8str(busy_response)));
 
                 gSavedSettings.setBOOL("IMInChatConsole", childGetValue("include_im_in_chat_console").asBoolean());
+                gSavedSettings.setBOOL("IMInChatHistory", childGetValue("include_im_in_chat_history").asBoolean());
                 gSavedSettings.setBOOL("IMShowTimestamps", childGetValue("show_timestamps_check").asBoolean());
                 gSavedSettings.setBOOL("ChatOnlineNotification", childGetValue("friends_online_notify_checkbox").asBoolean());
                 
@@ -236,6 +239,7 @@ void LLPrefsIMImpl::setPersonalInfo(const std::string& visibility, bool im_via_e
         }
 
         childEnable("include_im_in_chat_console");
+        childEnable("include_im_in_chat_history");
         childEnable("show_timestamps_check");
         childEnable("friends_online_notify_checkbox");