diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2023-08-17 19:37:24 +0300 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2023-08-17 19:37:24 +0300 |
| commit | e06cdc329a83b4c1e52eaf39b4b030763b7d8568 (patch) | |
| tree | 81f83f5068b6767cdf54929dc974080bbd38a541 | |
| parent | 5430efbb31cfc0f57eac7fd130bb43aafa85143a (diff) | |
SL-20158 FIXED Ctrl+H shortcut acts erratically when Nearby Chat floater is undocked
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 84396c2c68..814237ecdd 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -6141,8 +6141,9 @@ class LLCommunicateNearbyChat : public view_listener_t bool handleEvent(const LLSD& userdata) { LLFloaterIMContainer* im_box = LLFloaterIMContainer::getInstance(); - bool nearby_visible = LLFloaterReg::getTypedInstance<LLFloaterIMNearbyChat>("nearby_chat")->isInVisibleChain(); - if(nearby_visible && im_box->getSelectedSession() == LLUUID() && im_box->getConversationListItemSize() > 1) + LLFloaterIMNearbyChat* floater_nearby = LLFloaterReg::getTypedInstance<LLFloaterIMNearbyChat>("nearby_chat"); + if (floater_nearby->isInVisibleChain() && !floater_nearby->isTornOff() + && im_box->getSelectedSession() == LLUUID() && im_box->getConversationListItemSize() > 1) { im_box->selectNextorPreviousConversation(false); } |