summaryrefslogtreecommitdiff
path: root/indra/newview/llselectmgr.h
diff options
context:
space:
mode:
authorAlain Linden <alain@lindenlab.com>2011-03-03 13:56:43 -0800
committerAlain Linden <alain@lindenlab.com>2011-03-03 13:56:43 -0800
commitba1d1267fe2214198b36b5ed130a9a4ae5c5fb3f (patch)
tree5e647d28eaeed51872ff9ca65536aeb2ce90535a /indra/newview/llselectmgr.h
parent0d93ce2e4a3daabc8d653290e39b67e5cddabb14 (diff)
parentd0ed06ffcae08a11ee8b5ff35692b25b5cbbb48a (diff)
Automated merge with https://bitbucket.org/jenn_linden/viewer-vs2010
Diffstat (limited to 'indra/newview/llselectmgr.h')
-rw-r--r--indra/newview/llselectmgr.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/llselectmgr.h b/indra/newview/llselectmgr.h
index 65a9a493f6..cb387f5c3c 100644
--- a/indra/newview/llselectmgr.h
+++ b/indra/newview/llselectmgr.h
@@ -440,6 +440,17 @@ public:
BOOL removeObjectFromSelections(const LLUUID &id);
////////////////////////////////////////////////////////////////
+ // Selection editing
+ ////////////////////////////////////////////////////////////////
+ bool linkObjects();
+
+ bool unlinkObjects();
+
+ bool enableLinkObjects();
+
+ bool enableUnlinkObjects();
+
+ ////////////////////////////////////////////////////////////////
// Selection accessors
////////////////////////////////////////////////////////////////
LLObjectSelectionHandle getSelection() { return mSelectedObjects; }