diff options
| author | Dave Parks <davep@lindenlab.com> | 2012-10-09 18:27:42 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2012-10-09 18:27:42 -0500 |
| commit | 9db74ae962ad0c8864f8b236bed0bb503b0e96e1 (patch) | |
| tree | 9c77eb238d7d4c027a780fa4a0ee6499674d4a33 | |
| parent | 81ba7e031e522e38fca760861a710f7527edecdd (diff) | |
MAINT-1138 Fix for crash when picking rigged attachments.
| -rw-r--r-- | doc/contributions.txt | 3 | ||||
| -rw-r--r-- | indra/newview/llvovolume.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index f18985adcd..3a543db173 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 5d1c335078..538911e9b8 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; } |