From d373dcc7cbed5fdea72c6b71a5594e4e85549b43 Mon Sep 17 00:00:00 2001 From: Don Kjer Date: Fri, 20 Jul 2007 20:38:05 +0000 Subject: svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into release * WARNING *: maintenance r64837 is not the last rev to use in the next merge. use r65269 --- indra/newview/llselectmgr.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'indra/newview/llselectmgr.cpp') diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index 54ac03a3c5..341dec4115 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -3460,7 +3460,6 @@ void LLSelectMgr::deselectAll() mLastSentSelectionCenterGlobal.clearVec(); updatePointAt(); - gHUDManager->clearJoints(); updateSelectionCenter(); } @@ -5497,7 +5496,7 @@ void LLSelectMgr::updateSelectionCenter() // have stuff selected LLVector3d select_center; // keep a list of jointed objects for showing the joint HUDEffects - gHUDManager->clearJoints(); + LLDynamicArray < LLViewerObject *> jointed_objects; for (object = mSelectedObjects->getFirstObject(); object; object = mSelectedObjects->getNextObject() ) @@ -5523,10 +5522,6 @@ void LLSelectMgr::updateSelectionCenter() mSelectionCenterGlobal = gAgent.getPosGlobalFromAgent(bbox_center_agent); mSelectionBBox = bbox; - if (jointed_objects.count()) - { - gHUDManager->showJoints(&jointed_objects); - } } if ( !(gAgentID == LLUUID::null) && gToolMgr) -- cgit v1.2.3