From e61a10ec5b6b84fcb5c27e8e308022d0094f8736 Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Mon, 4 Jun 2007 18:46:59 +0000
Subject: svn merge -r 62602:62831
 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release

---
 indra/newview/lltoolselectland.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

diff --git a/indra/newview/lltoolselectland.cpp b/indra/newview/lltoolselectland.cpp
index f64bf6bf2d..84834d5802 100644
--- a/indra/newview/lltoolselectland.cpp
+++ b/indra/newview/lltoolselectland.cpp
@@ -198,7 +198,7 @@ void LLToolSelectLand::handleSelect()
 {
 	gFloaterTools->setStatusText("Click and drag to select land");
 	mLastShowParcelOwners = gSavedSettings.getBOOL("ShowParcelOwners");
-	gSavedSettings.setBOOL("ShowParcelOwners", TRUE);
+	gSavedSettings.setBOOL("ShowParcelOwners", mLastShowParcelOwners);
 }
 
 
@@ -206,6 +206,7 @@ void LLToolSelectLand::handleDeselect()
 {
 	gFloaterTools->setStatusText("");
 	mSelection = NULL;
+	mLastShowParcelOwners = gSavedSettings.getBOOL("ShowParcelOwners");
 	//gParcelMgr->deselectLand();
 	gSavedSettings.setBOOL("ShowParcelOwners", mLastShowParcelOwners);
 }
-- 
cgit v1.3