From 73bc0fb42b5bcd80030d9f30d5cb57ec2397ba08 Mon Sep 17 00:00:00 2001 From: Richard Nelson Date: Sat, 17 Feb 2007 03:02:16 +0000 Subject: merge -r 56779:58057 /branches/selection_management --- indra/newview/lltoolface.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/lltoolface.cpp') diff --git a/indra/newview/lltoolface.cpp b/indra/newview/lltoolface.cpp index c35fcb434c..e103af0bd3 100644 --- a/indra/newview/lltoolface.cpp +++ b/indra/newview/lltoolface.cpp @@ -42,7 +42,7 @@ LLToolFace::~LLToolFace() BOOL LLToolFace::handleDoubleClick(S32 x, S32 y, MASK mask) { - if (!gSelectMgr->isEmpty()) + if (!gSelectMgr->getSelection()->isEmpty()) { // You should already have an object selected from the mousedown. // If so, show its properties @@ -90,7 +90,7 @@ void LLToolFace::pickCallback(S32 x, S32 y, MASK mask) // object wasn't selected so add the object and face gSelectMgr->selectObjectOnly(hit_obj, hit_face); } - else if (!gSelectMgr->contains(hit_obj, hit_face) ) + else if (!gSelectMgr->getSelection()->contains(hit_obj, hit_face) ) { // object is selected, but not this face, so add it. gSelectMgr->addAsIndividual(hit_obj, hit_face); -- cgit v1.2.3