From e03bb0606a10f29c8b94909a713a5bb5c69e88b7 Mon Sep 17 00:00:00 2001
From: Kelly Washington <kelly@lindenlab.com>
Date: Thu, 21 Jun 2007 22:40:22 +0000
Subject: merge -r62831:64079 branches/maintenance to release

---
 indra/newview/lltoolselect.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/indra/newview/lltoolselect.cpp b/indra/newview/lltoolselect.cpp
index 1223bc5104..475fc4a0d1 100644
--- a/indra/newview/lltoolselect.cpp
+++ b/indra/newview/lltoolselect.cpp
@@ -209,7 +209,7 @@ LLHandle<LLObjectSelection> LLToolSelect::handleObjectSelection(LLViewerObject *
 
 BOOL LLToolSelect::handleMouseUp(S32 x, S32 y, MASK mask)
 {
-	mIgnoreGroup = !gSavedSettings.getBOOL("SelectLinkedSet");
+	mIgnoreGroup = gSavedSettings.getBOOL("EditLinkedParts");
 
 	LLViewerObject* object = gObjectList.findObject(mSelectObjectID);
 	LLToolSelect::handleObjectSelection(object, mask, mIgnoreGroup, FALSE);
-- 
cgit v1.2.3