diff options
| author | Vir Linden <vir@lindenlab.com> | 2021-10-25 15:55:06 +0000 |
|---|---|---|
| committer | Vir Linden <vir@lindenlab.com> | 2021-10-25 15:55:06 +0000 |
| commit | ba3459f77fc9b93c8dd79bc3ac7c59ba792da27f (patch) | |
| tree | 6267b828141028889894be919263c6d19c6e54c1 /indra/newview/llfloaterimcontainer.cpp | |
| parent | a42b5d680935f08310de69f240435a7b67227a4d (diff) | |
| parent | 3efd4c50a031ce0c1cb3d2fcc43e403136277e1f (diff) | |
Merged DRTVWR-546 into SL-15999
Diffstat (limited to 'indra/newview/llfloaterimcontainer.cpp')
| -rw-r--r-- | indra/newview/llfloaterimcontainer.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp index 9c84fa1991..2ccb9ab074 100644 --- a/indra/newview/llfloaterimcontainer.cpp +++ b/indra/newview/llfloaterimcontainer.cpp @@ -723,7 +723,13 @@ void LLFloaterIMContainer::setMinimized(BOOL b) } void LLFloaterIMContainer::setVisible(BOOL visible) -{ LLFloaterIMNearbyChat* nearby_chat; +{ + if (LLFloater::isQuitRequested()) + { + return; + } + + LLFloaterIMNearbyChat* nearby_chat; if (visible) { // Make sure we have the Nearby Chat present when showing the conversation container |