svn merge -r 62602:62831 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release

1 files changed, 2 insertions, 1 deletions

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);
 }