From db7b0c17858e226eb3f76acf965fde7a92426b95 Mon Sep 17 00:00:00 2001 From: Aleric Inglewood Date: Tue, 15 Jan 2013 00:11:17 +0100 Subject: [PATCH] Revert last part (work in progress of last two commits, I guess). --- indra/llmath/llvolume.cpp | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp index 162e70f9c..7f36990e7 100644 --- a/indra/llmath/llvolume.cpp +++ b/indra/llmath/llvolume.cpp @@ -3147,24 +3147,16 @@ void LLVolume::sculpt(U16 sculpt_width, U16 sculpt_height, S8 sculpt_components, data_is_empty = TRUE; } - // Singu Note: initialize sizeS and sizeT as 0 for the case that data_is_empty. - S32 sizeS = 0; - S32 sizeT = 0; - if (!data_is_empty) // Singu Note: do not call these functions when we have no data. - { - mPathp->generate(mParams.getPathParams(), sculpt_detail, 0, TRUE, requested_sizeS); - mProfilep->generate(mParams.getProfileParams(), mPathp->isOpen(), sculpt_detail, 0, TRUE, requested_sizeT); + mPathp->generate(mParams.getPathParams(), sculpt_detail, 0, TRUE, requested_sizeS); + mProfilep->generate(mParams.getProfileParams(), mPathp->isOpen(), sculpt_detail, 0, TRUE, requested_sizeT); - sizeS = mPathp->mPath.size(); // we requested a specific size, now see what we really got - sizeT = mProfilep->mProfile.size(); // we requested a specific size, now see what we really got - } - if (sizeS == 0 || sizeT == 0) // Singu Note: treat this case as if there is no data (there isn't sufficient data). + S32 sizeS = mPathp->mPath.size(); // we requested a specific size, now see what we really got + S32 sizeT = mProfilep->mProfile.size(); // we requested a specific size, now see what we really got + + // weird crash bug - DEV-11158 - trying to collect more data: + if ((sizeS == 0) || (sizeT == 0)) { - if (!data_is_empty) - { - llwarns << "sculpt bad mesh size " << sizeS << " " << sizeT << llendl; - } - data_is_empty = TRUE; + llwarns << "sculpt bad mesh size " << sizeS << " " << sizeT << llendl; } sNumMeshPoints -= mMesh.size();