OpenSimulator GForge > Projects > Hippo OpenSim Viewer > SVN

Diff of /trunk/linden/indra/newview/llprefsim.cpp

-revision 133, Mon May  4 18:15:39 2009 UTC
+revision 134, Wed May  6 20:32:39 2009 UTC
 Line 40
  #include "lltexteditor.h"
  #include "llavatarconstants.h"
  #include "llagent.h"
+ #include "llversionviewer.h"
  #include "llviewercontrol.h"
  #include "llviewernetwork.h"
  #include "lluictrlfactory.h"
-Line 171
+Line 172
                  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());
+         gSavedPerAccountSettings.setString("InstantMessageLogPath", childGetText("log_path_string"));
                  gDirUtilp->setChatLogsDir(gSavedPerAccountSettings.getString("InstantMessageLogPath"));
                  gDirUtilp->setPerAccountChatLogsDir(gSavedSettings.getString("FirstName"),
-Line 246
+Line 249
          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"))
-Line 255
+Line 256
                  childDisable("busy_response");
          }
  //mk
+ #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") );

 Legend:



Removed from v.133
 


changed lines


 
Added in v.134
 Legend:



Removed from v.133
 


changed lines


 
Added in v.134
-Removed from v.133
+Added in v.134

	ViewVC Help
Powered by ViewVC 1.0.0

MyGforge Home

Hippo OpenSim Viewer

Diff of /trunk/linden/indra/newview/llprefsim.cpp