From 117e22047c5752352342d64e3fb7ce00a4eb8113 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 15 Aug 2008 23:45:04 -0500
Subject: Second Life viewer sources 1.18.1.2

---
 linden/indra/newview/llselectmgr.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'linden/indra/newview/llselectmgr.h')

diff --git a/linden/indra/newview/llselectmgr.h b/linden/indra/newview/llselectmgr.h
index 7eff94a..fec3a0a 100644
--- a/linden/indra/newview/llselectmgr.h
+++ b/linden/indra/newview/llselectmgr.h
@@ -239,7 +239,8 @@ public:
 	void updateEffects(); // Update HUD effects
 	void overrideObjectUpdates();
 
-	void setForceSelection(BOOL force) { mForceSelection = force; }
+	// Returns the previous value of mForceSelection
+	BOOL setForceSelection(BOOL force);
 
 	////////////////////////////////////////////////////////////////
 	// Selection methods
@@ -273,7 +274,7 @@ public:
 	////////////////////////////////////////////////////////////////
 
 	void deselectObjectOnly(LLViewerObject* object, BOOL send_to_sim = TRUE);
-	void deselectObjectAndFamily(LLViewerObject* object, BOOL send_to_sim = TRUE);
+	void deselectObjectAndFamily(LLViewerObject* object, BOOL send_to_sim = TRUE, BOOL include_entire_object = FALSE);
 
 	// Send deselect messages to simulator, then clear the list
 	void deselectAll();
-- 
cgit v1.1