From 647d29b1a2d4712ea738b408be43e56895a715b1 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Tue, 27 Feb 2007 01:03:39 +0000 Subject: merge -r 58285:58437 maintenance. --- indra/newview/lltoolselect.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'indra/newview/lltoolselect.cpp') diff --git a/indra/newview/lltoolselect.cpp b/indra/newview/lltoolselect.cpp index 14ffb00158..1223bc5104 100644 --- a/indra/newview/lltoolselect.cpp +++ b/indra/newview/lltoolselect.cpp @@ -74,7 +74,7 @@ BOOL LLToolSelect::handleDoubleClick(S32 x, S32 y, MASK mask) } // static -void LLToolSelect::handleObjectSelection(LLViewerObject *object, MASK mask, BOOL ignore_group, BOOL temp_select) +LLHandle LLToolSelect::handleObjectSelection(LLViewerObject *object, MASK mask, BOOL ignore_group, BOOL temp_select) { BOOL select_owned = gSavedSettings.getBOOL("SelectOwnedOnly"); BOOL select_movable = gSavedSettings.getBOOL("SelectMovableOnly"); @@ -203,6 +203,8 @@ void LLToolSelect::handleObjectSelection(LLViewerObject *object, MASK mask, BOOL gSavedSettings.setBOOL("SelectMovableOnly", select_movable); gSelectMgr->setForceSelection(FALSE); } + + return gSelectMgr->getSelection(); } BOOL LLToolSelect::handleMouseUp(S32 x, S32 y, MASK mask) -- cgit v1.2.3