diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-03-06 00:37:09 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-03-06 00:37:09 +0000 |
| commit | 14360b815ed486c90c57b8025f8c93376ca6b6c6 (patch) | |
| tree | 30707bf0bf390ebf6357325aa31e34ad8553f2ac /indra/newview/llviewerwindow.cpp | |
| parent | b06b9cd30464188f68a1125db9ecc588fdf5ca71 (diff) | |
merge -r 58641:58711 maintenance -> release
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 9d4367cc79..aebcfdb9ce 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -2699,13 +2699,13 @@ BOOL LLViewerWindow::handlePerFrameHover() gChatBar->startChat(NULL); } - // cleanup unused selections - if (gParcelMgr) + // cleanup unused selections when no modal dialogs are open + if (gParcelMgr && LLModalDialog::activeCount() == 0) { gParcelMgr->deselectUnused(); } - if (gSelectMgr) + if (gSelectMgr && LLModalDialog::activeCount() == 0) { gSelectMgr->deselectUnused(); } |