diff options
| author | Eli Linden <eli@lindenlab.com> | 2010-01-26 14:33:28 -0800 |
|---|---|---|
| committer | Eli Linden <eli@lindenlab.com> | 2010-01-26 14:33:28 -0800 |
| commit | a87cbadf16cb8a32ea78fb605403472ee866bccf (patch) | |
| tree | 07b4eb3d31491ca30d02952442ce53b1cd426c55 /indra/newview/llnotificationhandlerutil.cpp | |
| parent | 3f7ed7ef1de1012e3bea719e8042a256deb10ac3 (diff) | |
| parent | fee564c26e1018787cf70b95fc677c1da447118c (diff) | |
Merge
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); + } } } |