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

FIRE-31179: Fix double-clicking on friend list item might execute underlying URL in opened IM window

master
Ansariel 2022-01-04 15:00:41 +01:00
parent df213527b5
commit 9c0973f787
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/llui/lltextbase.cpp
View File

@ -1145,10 +1145,7 @@ BOOL LLTextBase::handleMouseDown(S32 x, S32 y, MASK mask)
BOOL LLTextBase::handleMouseUp(S32 x, S32 y, MASK mask)
{
LLTextSegmentPtr cur_segment = getSegmentAtLocalPos(x, y);
// <FS:Beq> FIRE-23523 left click does not work on notifications with embedded links
// if (hasMouseCapture() && cur_segment && cur_segment->handleMouseUp(x, y, mask))
if (cur_segment && cur_segment->handleMouseUp(x, y, mask))
// </FS:Beq>
if (hasMouseCapture() && cur_segment && cur_segment->handleMouseUp(x, y, mask))
{
// Did we just click on a link?
if (mURLClickSignal

4
indra/llui/lltextbox.cpp
View File

@ -35,6 +35,8 @@
#include "llurlregistry.h"
#include "llstyle.h"
#include "llmodaldialog.h"
static LLDefaultChildRegistry::Register<LLTextBox> r("text");
// Compiler optimization, generate extern template
@ -71,7 +73,7 @@ BOOL LLTextBox::handleMouseDown(S32 x, S32 y, MASK mask)
// Route future Mouse messages here preemptively. (Release on mouse up.)
// <FS> FIRE-10172: This interferes with the scroll bar buttons.
//gFocusMgr.setMouseCapture( this );
if (!gFocusMgr.getMouseCapture())
if (!gFocusMgr.getMouseCapture() || getParentByType<LLModalDialog>())
gFocusMgr.setMouseCapture( this );
// </FS>
}