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

FIRE-11734: Delete Transcripts wipes history from any currently open conversation as well

Cinders 2013-10-03 20:56:48 -06:00
parent 1ddec81e0a
commit 6defc8f6b2
3 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
indra/newview/fsfloaterim.cpp
View File

@ -76,6 +76,7 @@
#include "llnotificationtemplate.h" // <FS:Zi> Viewer version popup
#include "fscommon.h"
#include "fsfloaternearbychat.h"
floater_showed_signal_t FSFloaterIM::sIMFloaterShowedSignal;
@ -1520,7 +1521,6 @@ void FSFloaterIM::processChatHistoryStyleUpdate(const LLSD& newvalue)
floater->mInputEditor->setFont(font);
}
}
}
void FSFloaterIM::processSessionUpdate(const LLSD& session_update)
@ -1875,6 +1875,28 @@ void FSFloaterIM::setEnableAddFriendButton(BOOL enabled)
}
// </FS:Ansariel>
// <FS:CR> FIRE-11734
//static
void FSFloaterIM::clearAllOpenHistories()
{
LLFloaterReg::const_instance_list_t& inst_list = LLFloaterReg::getFloaterList("fs_impanel");
for (LLFloaterReg::const_instance_list_t::const_iterator iter = inst_list.begin();
iter != inst_list.end(); ++iter)
{
FSFloaterIM* floater = dynamic_cast<FSFloaterIM*>(*iter);
if (floater)
{
floater->reloadMessages(true);
}
}
FSFloaterNearbyChat* nearby_chat = LLFloaterReg::getTypedInstance<FSFloaterNearbyChat>("fs_nearby_chat", LLSD());
if (nearby_chat)
{
nearby_chat->reloadMessages(true);
}
}
void FSFloaterIM::initIMSession(const LLUUID& session_id)
{
// Change the floater key to bind it to a new session.

2
indra/newview/fsfloaterim.h
View File

@ -116,6 +116,8 @@ public:
void updateChatHistoryStyle();
static void processChatHistoryStyleUpdate(const LLSD& newvalue);
static void clearAllOpenHistories(); // <FS:CR> FIRE-11734
BOOL handleDragAndDrop(S32 x, S32 y, MASK mask,
BOOL drop, EDragAndDropType cargo_type,

6
indra/newview/lllogchat.cpp
View File

@ -672,10 +672,10 @@ void LLLogChat::deleteTranscripts()
}
}
}
// <FS:CR> Firestorm communications UI
// <FS:CR> FIRE-11734 - Flush out the current histories from any open chat window
//LLFloaterIMSessionTab::processChatHistoryStyleUpdate(true);
FSFloaterIM::processChatHistoryStyleUpdate(true);
FSFloaterIM::clearAllOpenHistories();
// </FS:CR>
}