livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge 

--HG--
branch : product-engine
meow-7.2.2
Vadim Savchuk 2010-04-07 18:41:15 +03:00
parent bb2a0adeca 8329dbdc37
commit c9e0b6e476
5 changed files with 51 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
indra/newview/app_settings/settings_per_account.xml
View File

@ -22,17 +22,6 @@
<key>Value</key>
<string>|TOKEN COPY BusyModeResponse|</string>
</map>
<key>InstantMessageLogFolder</key>
<map>
<key>Comment</key>
<string>Top level folder to your log files.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>String</string>
<key>Value</key>
<string />
</map>
<key>InstantMessageLogPath</key>
<map>
<key>Comment</key>
@ -55,10 +44,10 @@
<key>Value</key>
<integer>0</integer>
</map>
<key>LogChat</key>
<key>LogNearbyChat</key>
<map>
<key>Comment</key>
<string>Log Chat</string>
<string>Log Nearby Chat messages to a file. Is used instead of LogChat but with the "1" default value.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
@ -110,5 +99,46 @@
<key>Value</key>
<integer>1</integer>
</map>
<!-- Settings below are for back compatibility only.
They are not used in current viewer anymore. But they can't be removed to avoid
influence on previous versions of the viewer in case of settings are not used or default value
should be changed. See EXT-6661. -->
<!-- 1.23 settings -->
<key>LogChat</key>
<map>
<key>Comment</key>
<string>Log Chat</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>LogChatIM</key>
<map>
<key>Comment</key>
<string>Log Incoming Instant Messages with Chat</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<key>LogChatTimestamp</key>
<map>
<key>Comment</key>
<string>Log Timestamp of Chat</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
<!-- End of back compatibility settings -->
</map>
</llsd>

6
indra/newview/llfloaterpreference.cpp
View File

@ -1083,10 +1083,8 @@ void LLFloaterPreference::onClickLogPath()
{
return; //Canceled!
}
std::string chat_log_dir = picker.getDirName();
std::string chat_log_top_folder= gDirUtilp->getBaseFileName(chat_log_dir);
gSavedPerAccountSettings.setString("InstantMessageLogPath",chat_log_dir);
gSavedPerAccountSettings.setString("InstantMessageLogFolder",chat_log_top_folder);
gSavedPerAccountSettings.setString("InstantMessageLogPath", picker.getDirName());
}
void LLFloaterPreference::setPersonalInfo(const std::string& visibility, bool im_via_email, const std::string& email)

2
indra/newview/llnearbychat.cpp
View File

@ -207,7 +207,7 @@ void LLNearbyChat::addMessage(const LLChat& chat,bool archive,const LLSD &args)
return;
}
if (gSavedPerAccountSettings.getBOOL("LogChat"))
if (gSavedPerAccountSettings.getBOOL("LogNearbyChat"))
{
LLLogChat::saveHistory("chat", chat.mFromName, chat.mFromID, chat.mText);
}

9
indra/newview/llstartup.cpp
View File

@ -889,13 +889,12 @@ bool idle_startup()
}
//Default the path if one isn't set.
if (gSavedPerAccountSettings.getString("InstantMessageLogFolder").empty())
// *NOTE: unable to check variable differ from "InstantMessageLogPath" because it was
// provided in pre 2.0 viewer. See EXT-6661
if (gSavedPerAccountSettings.getString("InstantMessageLogPath").empty())
{
gDirUtilp->setChatLogsDir(gDirUtilp->getOSUserAppDir());
std::string chat_log_dir = gDirUtilp->getChatLogsDir();
std::string chat_log_top_folder=gDirUtilp->getBaseFileName(chat_log_dir);
gSavedPerAccountSettings.setString("InstantMessageLogPath",chat_log_dir);
gSavedPerAccountSettings.setString("InstantMessageLogFolder",chat_log_top_folder);
gSavedPerAccountSettings.setString("InstantMessageLogPath", gDirUtilp->getChatLogsDir());
}
else
{

2
indra/newview/skins/default/xui/en/panel_preferences_privacy.xml
View File

@ -84,7 +84,7 @@
</text>
<check_box
enabled="false"
control_name="LogChat"
control_name="LogNearbyChat"
height="16"
label="Save nearby chat logs on my computer"
layout="topleft"