diff options
| author | Armin Weatherwax | 2011-01-04 16:13:56 +0100 |
|---|---|---|
| committer | Armin Weatherwax | 2011-01-04 16:13:56 +0100 |
| commit | d89bfb3ec03e03df2b3e7ee1588e578bbc351161 (patch) | |
| tree | b161085bca0431eceea93cf0c6dcb756da039d03 /linden/indra | |
| parent | delete gAudioStream at shutdown. (diff) | |
| download | meta-impy-d89bfb3ec03e03df2b3e7ee1588e578bbc351161.zip meta-impy-d89bfb3ec03e03df2b3e7ee1588e578bbc351161.tar.gz meta-impy-d89bfb3ec03e03df2b3e7ee1588e578bbc351161.tar.bz2 meta-impy-d89bfb3ec03e03df2b3e7ee1588e578bbc351161.tar.xz | |
fix crash when linking objects using rubberband selection.
Diffstat (limited to 'linden/indra')
| -rw-r--r-- | linden/indra/newview/llfloatertools.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
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) | |||
| 1259 | } | 1259 | } |
| 1260 | 1260 | ||
| 1261 | S32 max_linked_prims = 0; | 1261 | S32 max_linked_prims = 0; |
| 1262 | if(LLSelectMgr::getInstance()->getSelection()->getPrimaryObject()->usePhysics()) | 1262 | |
| 1263 | LLViewerObject* object = LLSelectMgr::getInstance()->getSelection()->getFirstRootObject(); | ||
| 1264 | if(object && object->usePhysics()) | ||
| 1263 | { | 1265 | { |
| 1264 | //Physical - use phys prim limit | 1266 | //Physical - use phys prim limit |
| 1265 | max_linked_prims = gHippoLimits->getMaxPhysLinkedPrims(); | 1267 | max_linked_prims = gHippoLimits->getMaxPhysLinkedPrims(); |