diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-09-14 09:12:47 +0300 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-09-14 09:12:47 +0300 |
| commit | fd83e889642518803b0041761a3d4bf81df21e3e (patch) | |
| tree | f2d2634f35975450030ad26398c4d53cb05660f8 | |
| parent | a8eb461e8a95f7e7def15e14dc3f60bb48dde958 (diff) | |
SL-1288 show the "Mini-Inspector" of LLNameListCtrl only on a frontmost floaters
| -rw-r--r-- | indra/newview/llnamelistctrl.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llnamelistctrl.cpp b/indra/newview/llnamelistctrl.cpp index 60b4c62e8f..62e0e2d077 100644 --- a/indra/newview/llnamelistctrl.cpp +++ b/indra/newview/llnamelistctrl.cpp @@ -32,6 +32,7 @@ #include "llavatarnamecache.h" #include "llcachename.h" +#include "llfloater.h" #include "llfloaterreg.h" #include "llinventory.h" #include "llscrolllistitem.h" @@ -212,7 +213,10 @@ BOOL LLNameListCtrl::handleToolTip(S32 x, S32 y, MASK mask) BOOL handled = FALSE; S32 column_index = getColumnIndexFromOffset(x); LLNameListItem* hit_item = dynamic_cast<LLNameListItem*>(hitItem(x, y)); - if (hit_item + LLFloater* floater = gFloaterView->getParentFloater(this); + if (floater + && floater->isFrontmost() + && hit_item && column_index == mNameColumnIndex) { // ...this is the column with the avatar name |