summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorAlexanderP ProductEngine <apaschenko@productengine.com>2012-12-06 19:26:52 +0200
committerAlexanderP ProductEngine <apaschenko@productengine.com>2012-12-06 19:26:52 +0200
commite2c080b5582d08302d1deaf1fb64cab1a67c138a (patch)
tree2cea82bd7f39398c0f77c4c8734ccee0834fd278 /indra
parent567df7bf275dfd33cf1b1fea945e3e544571b4aa (diff)
CHUI-505 FIXED Open Call Log if user has new events while out:
force open Conversation Log Floater when received a saved offline message
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llimview.cpp13
1 files changed, 13 insertions, 0 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 821e62c4e6..ea123d3f15 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -30,6 +30,7 @@
#include "llavatarnamecache.h" // IDEVO
#include "llavataractions.h"
+#include "llfloaterconversationlog.h"
#include "llfloaterreg.h"
#include "llfontgl.h"
#include "llgl.h"
@@ -2467,6 +2468,18 @@ void LLIMMgr::addMessage(
new_session_id = computeSessionID(dialog, other_participant_id);
}
+ // Open conversation log if offline messages are present
+ if (is_offline_msg)
+ {
+ LLFloaterConversationLog* floater_log =
+ LLFloaterReg::getTypedInstance<LLFloaterConversationLog>("conversation");
+ if (floater_log && !(floater_log->isFrontmost()))
+ {
+ floater_log->openFloater();
+ floater_log->setFrontmost(TRUE);
+ }
+ }
+
//*NOTE session_name is empty in case of incoming P2P sessions
std::string fixed_session_name = from;
bool name_is_setted = false;