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

Open nearby chat container when clicking on nearby chat toasts and chat history is docked; fixes FIRE-6265

Ansariel 2012-05-12 13:09:51 +02:00
parent 7af4a61310
commit 23ee2e32d4
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
indra/newview/llchatitemscontainerctrl.cpp
View File

@ -332,6 +332,14 @@ BOOL LLNearbyChatToastPanel::handleMouseUp (S32 x, S32 y, MASK mask)
// LLNearbyChatBar::getInstance()->showHistory();
LLFloaterNearbyChat::getInstance()->setVisible(TRUE);
// </FS:Zi>
// <FS:Ansariel> If nearby chat history is docked, we also need
// to open the container floater (FIRE-6265)
if (!gSavedSettings.getBOOL("ChatHistoryTornOff"))
{
LLFloaterReg::showInstance("im_container");
}
// </FS:Ansariel>
return FALSE;
}
}
@ -340,6 +348,14 @@ BOOL LLNearbyChatToastPanel::handleMouseUp (S32 x, S32 y, MASK mask)
// LLNearbyChatBar::getInstance()->showHistory();
LLFloaterNearbyChat::getInstance()->setVisible(TRUE);
// </FS:Zi>
// <FS:Ansariel> If nearby chat history is docked, we also need
// to open the container floater (FIRE-6265)
if (!gSavedSettings.getBOOL("ChatHistoryTornOff"))
{
LLFloaterReg::showInstance("im_container");
}
// </FS:Ansariel>
return LLPanel::handleMouseUp(x,y,mask);
}