From fbf49910f34278a39dffff7e6c8bc654839988fb Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Mon, 8 Jan 2007 21:43:30 +0000
Subject: svn merge -r 56431:56560
 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance

---
 indra/newview/llviewerwindow.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'indra/newview/llviewerwindow.cpp')

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();
 	}
-- 
cgit v1.2.3