diff --git a/doc/contributions.txt b/doc/contributions.txt index e20b7b83c5e3a0b8126e7ef747fc7f7a3939d14b..43de729bff67245269b6edbc9991cc721f6af901 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -1057,9 +1057,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 eb3bbb15bfcfb7464c64be3e61e65ac11baa9f4e..51edba5916bbfcd9cfb497b732f006b08b7f5ffb 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -1484,7 +1484,7 @@ BOOL LLVOVolume::genBBoxes(BOOL force_global) updateRadius(); mDrawable->movePartition(); - + return res; } @@ -3574,7 +3574,6 @@ BOOL LLVOVolume::lineSegmentIntersect(const LLVector3& start, const LLVector3& e if (LLFloater::isVisible(gFloaterTools) && getAvatar()->isSelf()) { updateRiggedVolume(); - genBBoxes(FALSE); volume = mRiggedVolume; transform = false; }