diff options
| author | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-01-29 18:55:16 +0200 |
|---|---|---|
| committer | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-01-29 18:55:16 +0200 |
| commit | 61216e1fe0c136188e01110d40d6762379e0144a (patch) | |
| tree | ae1fee8990848f9e005cfd8fefcf62805f90eb4f | |
| parent | 675df36965c346f323bb2025cd832a4dc7c9cdce (diff) | |
| parent | 159c788918c410eb384dcfce1555c8a7d01b69c4 (diff) | |
merge
--HG--
branch : product-engine
| -rw-r--r-- | indra/newview/llappviewer.cpp | 9 | ||||
| -rw-r--r-- | indra/newview/llchathistory.cpp | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 9bb0977c1a..2d694eefd3 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -2891,7 +2891,14 @@ static LLNotificationFunctorRegistration finish_quit_reg("ConfirmQuit", finish_q void LLAppViewer::userQuit() { - LLNotificationsUtil::add("ConfirmQuit"); + if (gDisconnected) + { + requestQuit(); + } + else + { + LLNotificationsUtil::add("ConfirmQuit"); + } } static bool finish_early_exit(const LLSD& notification, const LLSD& response) diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index acbd0db868..a570862675 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -313,7 +313,7 @@ protected: showSystemContextMenu(x,y); if(mSourceType == CHAT_SOURCE_AGENT) showAvatarContextMenu(x,y); - if(mSourceType == CHAT_SOURCE_OBJECT) + if(mSourceType == CHAT_SOURCE_OBJECT && SYSTEM_FROM != mFrom) showObjectContextMenu(x,y); } |