diff --git a/doc/contributions.txt b/doc/contributions.txt index f18985adcda7159d4cb59a1d4176e703cdc6120e..3a543db1730eef87b7d935ba8020aa3297929985 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -1059,9 +1059,12 @@ Shawn Kaufmat SNOW-240 Sheet Spotter Shnurui Troughton +Shyotl Kuhr + MAINT-1138 Siana Gearz STORM-960 STORM-1088 + MAINT-1138 sicarius Thorne Sicarius Toxx SignpostMarv Martin diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index 5d1c3350785e80d5818283a00e69dc992aecc7fd..538911e9b879f11378fd3cb13cacbea6f528b6f7 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -1483,7 +1483,7 @@ BOOL LLVOVolume::genBBoxes(BOOL force_global) updateRadius(); mDrawable->movePartition(); - + return res; } @@ -3583,7 +3583,6 @@ BOOL LLVOVolume::lineSegmentIntersect(const LLVector3& start, const LLVector3& e if (LLFloater::isVisible(gFloaterTools) && getAvatar()->isSelf()) { updateRiggedVolume(); - genBBoxes(FALSE); volume = mRiggedVolume; transform = false; }