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/lltoolindividual.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview/lltoolindividual.cpp') diff --git a/indra/newview/lltoolindividual.cpp b/indra/newview/lltoolindividual.cpp index a5afd379ed..a6c74be00e 100644 --- a/indra/newview/lltoolindividual.cpp +++ b/indra/newview/lltoolindividual.cpp @@ -66,7 +66,7 @@ void LLToolIndividual::pickCallback(S32 x, S32 y, MASK mask) BOOL LLToolIndividual::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 inventory. @@ -85,10 +85,10 @@ BOOL LLToolIndividual::handleDoubleClick(S32 x, S32 y, MASK mask) void LLToolIndividual::handleSelect() { - LLViewerObject* obj = gSelectMgr->getFirstRootObject(); + LLViewerObject* obj = gSelectMgr->getSelection()->getFirstRootObject(); if(!obj) { - obj = gSelectMgr->getFirstObject(); + obj = gSelectMgr->getSelection()->getFirstObject(); } gSelectMgr->deselectAll(); if(obj) -- cgit v1.2.3