diff options
| author | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-01-19 17:13:21 +0200 |
|---|---|---|
| committer | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-01-19 17:13:21 +0200 |
| commit | 82de841c52357642d30b6d89b11da079f9c0f5d1 (patch) | |
| tree | 8ed3ec82392b6afd2ddf2023035fdfa45cd74c0b /indra/newview/llimview.cpp | |
| parent | 4610e911c959cdd21728822ae80b9e717ccd3012 (diff) | |
| parent | 00c05a885fb1cbee967065798f57d74bf47f2478 (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llimview.cpp')
| -rw-r--r-- | indra/newview/llimview.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 1930667d1e..6064415a10 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -79,7 +79,7 @@ #include "llrecentpeople.h" #include "llsyswellwindow.h" -#include "llfirstuse.h" +//#include "llfirstuse.h" #include "llagentui.h" #include "lltextutil.h" @@ -2402,7 +2402,9 @@ LLUUID LLIMMgr::addSession( //we don't need to show notes about online/offline, mute/unmute users' statuses for existing sessions if (!new_session) return session_id; - noteOfflineUsers(session_id, floater, ids); + //Per Plan's suggestion commented "explicit offline status warning" out to make Dessie happier (see EXT-3609) + //*TODO After February 2010 remove this commented out line if no one will be missing that warning + //noteOfflineUsers(session_id, floater, ids); // Only warn for regular IMs - not group IMs if( dialog == IM_NOTHING_SPECIAL ) |