diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-01-08 21:43:30 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-01-08 21:43:30 +0000 |
| commit | fbf49910f34278a39dffff7e6c8bc654839988fb (patch) | |
| tree | 627ae5b2818f671898b855d5ef8d02a9789d9432 /indra/newview/llviewerwindow.cpp | |
| parent | c618a55f769946369e3d80f71eeb3c42042ab4e0 (diff) | |
svn merge -r 56431:56560 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 331502c28a..8920d09fa6 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -69,6 +69,7 @@ #include "llfilepicker.h" #include "llfloater.h" #include "llfloaterbuildoptions.h" +#include "llfloaterbuyland.h" #include "llfloaterchat.h" #include "llfloatercustomize.h" #include "llfloatereditui.h" // HACK JAMESDEBUG for ui editor @@ -2661,7 +2662,10 @@ BOOL LLViewerWindow::handlePerFrameHover() } // sync land selection with edit and about land dialogs - if (gParcelMgr && !LLFloaterLand::floaterVisible() && (!gFloaterTools || !gFloaterTools->getVisible())) + if (gParcelMgr + && !LLFloaterLand::floaterVisible() + && !LLFloaterBuyLand::isOpen() + && (!gFloaterTools || !gFloaterTools->getVisible())) { gParcelMgr->deselectLand(); } |