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

CHUI-721 FIXED Delete transcripts when performing Clear log action.

meow-7.2.2
Mnikolenko ProductEngine 2013-02-04 14:37:29 +02:00
parent 2fe6fce018
commit 2f6ffe2183
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llconversationlog.cpp
View File

@ -531,7 +531,14 @@ void LLConversationLog::onClearLogResponse(const LLSD& notification, const LLSD&
{
if (0 == LLNotificationsUtil::getSelectedOption(notification, response))
{
deleteTranscripts();
mConversations.clear();
notifyObservers();
}
}
void LLConversationLog::deleteTranscripts()
{
gDirUtilp->deleteFilesInDir(gDirUtilp->getPerAccountChatLogsDir(), "*." + LL_TRANSCRIPT_FILE_EXTENSION);
LLFloaterIMSessionTab::processChatHistoryStyleUpdate(true);
}

1
indra/newview/llconversationlog.h
View File

@ -140,6 +140,7 @@ public:
void onClearLog();
void onClearLogResponse(const LLSD& notification, const LLSD& response);
void deleteTranscripts();
private:

16
indra/newview/llfloaterpreference.cpp
View File

@ -460,9 +460,6 @@ BOOL LLFloaterPreference::postBuild()
// set 'enable' property for 'Clear log...' button
changed();
// set 'enable' property for 'Delete transcripts...' button
updateDeleteTranscriptsButton();
LLLogChat::setSaveHistorySignal(boost::bind(&LLFloaterPreference::onLogChatHistorySaved, this));
return TRUE;
@ -1587,13 +1584,8 @@ void LLFloaterPreference::onDeleteTranscriptsResponse(const LLSD& notification,
{
if (0 == LLNotificationsUtil::getSelectedOption(notification, response))
{
gDirUtilp->deleteFilesInDir(gDirUtilp->getPerAccountChatLogsDir(), "*." + LL_TRANSCRIPT_FILE_EXTENSION);
std::vector<std::string> list_of_transcriptions_file_names;
LLLogChat::getListOfTranscriptFiles(list_of_transcriptions_file_names);
getChild<LLButton>("delete_transcripts")->setEnabled(list_of_transcriptions_file_names.size() > 0);
LLFloaterIMSessionTab::processChatHistoryStyleUpdate(true);
LLConversationLog::instance().deleteTranscripts();
updateDeleteTranscriptsButton();
}
}
@ -1668,6 +1660,10 @@ void LLFloaterPreference::selectChatPanel()
void LLFloaterPreference::changed()
{
getChild<LLButton>("clear_log")->setEnabled(LLConversationLog::instance().getConversations().size() > 0);
// set 'enable' property for 'Delete transcripts...' button
updateDeleteTranscriptsButton();
}
//------------------------------Updater---------------------------------------