Second Life viewer sources 1.18.1.2

1 files changed, 3 insertions, 2 deletions

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