livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge 

--HG--
branch : product-engine
meow-7.2.2
Ychebotarev ProductEngine 2010-01-29 18:55:16 +02:00
parent 675df36965 159c788918
commit 61216e1fe0
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/llappviewer.cpp
View File

@ -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)

2
indra/newview/llchathistory.cpp
View File

@ -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);
}