From 6c989a692d9b1efd0b76fae9776d8bbe876c2900 Mon Sep 17 00:00:00 2001
From: Dave Parks <davep@lindenlab.com>
Date: Tue, 9 Oct 2012 18:27:42 -0500
Subject: [PATCH] MAINT-1138 Fix for crash when picking rigged attachments.
---
doc/contributions.txt | 3 +++
indra/newview/llvovolume.cpp | 3 +--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/doc/contributions.txt b/doc/contributions.txt
index e20b7b83c5e..43de729bff6 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 eb3bbb15bfc..51edba5916b 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;
}
--
GitLab