diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-26 10:36:27 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-26 10:36:27 -0800 |
| commit | 3d771ed88b1f40ca0a5869530d729a58000ef028 (patch) | |
| tree | aabf54705b60159d791944019dcc48c79b1ed0ff /indra/newview/llnotificationhandlerutil.cpp | |
| parent | 020f855f643a198737e7bd4066bdc1757d864a54 (diff) | |
| parent | d72748a0af3e77de9a5dfedd2b8c9d87bfe7da24 (diff) | |
PE 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); + } } } |