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

FIRE-33958 - catch at least one mode where notifications can become stuck in the notifications list - more analysis needed as to why this is becoming an issue at all after all this time

meow-7.2.2
Zi Ree 2024-06-20 16:26:35 +02:00
parent 2dba8ec137
commit ef09c6bf08
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
indra/newview/llagent.cpp
View File

@ -2751,6 +2751,17 @@ void LLAgent::endAnimationUpdateUI()
// clean up UI from mode we're leaving
if (gAgentCamera.getLastCameraMode() == CAMERA_MODE_MOUSELOOK )
{
// <FS:Zi> FIRE-33958: clear out any visible toasts/group notices before leaving mouselook
LLNotificationsUI::LLScreenChannel* channel = dynamic_cast<LLNotificationsUI::LLScreenChannel*>(
LLNotificationsUI::LLChannelManager::getInstance()->findChannelByID(LLNotificationsUI::NOTIFICATION_CHANNEL_UUID)
);
if(channel)
{
channel->removeAndStoreAllStorableToasts();
}
// </FS:Zi>
// <FS:Zi> Unhide chat bar, unless autohide is enabled
gSavedSettings.setBOOL("MouseLookEnabled",FALSE);
if(!gSavedSettings.getBOOL("AutohideChatBar"))
@ -2914,6 +2925,16 @@ void LLAgent::endAnimationUpdateUI()
//---------------------------------------------------------------------
if (gAgentCamera.getCameraMode() == CAMERA_MODE_MOUSELOOK)
{
// <FS:Zi> FIRE-33958: clear out any visible toasts/group notices before entering mouselook
LLNotificationsUI::LLScreenChannel* channel = dynamic_cast<LLNotificationsUI::LLScreenChannel*>(
LLNotificationsUI::LLChannelManager::getInstance()->findChannelByID(LLNotificationsUI::NOTIFICATION_CHANNEL_UUID)
);
if(channel)
{
channel->removeAndStoreAllStorableToasts();
}
// </FS:Zi>
// <FS:PP> FIRE-8868: Show UI in mouselook
if(!gSavedSettings.getBOOL("FSShowInterfaceInMouselook"))