From d89bfb3ec03e03df2b3e7ee1588e578bbc351161 Mon Sep 17 00:00:00 2001 From: Armin Weatherwax Date: Tue, 4 Jan 2011 16:13:56 +0100 Subject: fix crash when linking objects using rubberband selection. --- linden/indra/newview/llfloatertools.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'linden') diff --git a/linden/indra/newview/llfloatertools.cpp b/linden/indra/newview/llfloatertools.cpp index 0cb35e3..2aed361 100644 --- a/linden/indra/newview/llfloatertools.cpp +++ b/linden/indra/newview/llfloatertools.cpp @@ -1259,7 +1259,9 @@ void LLFloaterTools::onClickLink(void* data) } S32 max_linked_prims = 0; - if(LLSelectMgr::getInstance()->getSelection()->getPrimaryObject()->usePhysics()) + + LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getFirstRootObject(); + if(object && object->usePhysics()) { //Physical - use phys prim limit max_linked_prims = gHippoLimits->getMaxPhysLinkedPrims(); -- cgit v1.1