diff options
author | CG Linden <cg@lindenlab.com> | 2010-01-26 13:44:24 -0800 |
---|---|---|
committer | CG Linden <cg@lindenlab.com> | 2010-01-26 13:44:24 -0800 |
commit | b8856efd5ff0e4899bb369dfd0815e824cd3a432 (patch) | |
tree | 4c99369867ed9e58b69dfad4ba8ee3a2e9a17b9b /indra/newview/llnotificationhandlerutil.cpp | |
parent | 5fc9d8bddad16b7d8dc6d481107a8ce690fdf731 (diff) | |
parent | fee564c26e1018787cf70b95fc677c1da447118c (diff) |
Pulled from viewer-2-0
Diffstat (limited to 'indra/newview/llnotificationhandlerutil.cpp')
-rw-r--r-- | indra/newview/llnotificationhandlerutil.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llnotificationhandlerutil.cpp b/indra/newview/llnotificationhandlerutil.cpp index fba5773602..02f948eca9 100644 --- a/indra/newview/llnotificationhandlerutil.cpp +++ b/indra/newview/llnotificationhandlerutil.cpp @@ -123,7 +123,14 @@ void LLHandlerUtil::logToIM(const EInstantMessage& session_type, message); // restore active session id - LLIMModel::instance().setActiveSessionID(active_session_id); + if (active_session_id.isNull()) + { + LLIMModel::instance().resetActiveSessionID(); + } + else + { + LLIMModel::instance().setActiveSessionID(active_session_id); + } } } |