diff options
| author | Mark Palange <palange@lindenlab.com> | 2008-12-23 19:39:58 +0000 |
|---|---|---|
| committer | Mark Palange <palange@lindenlab.com> | 2008-12-23 19:39:58 +0000 |
| commit | fb793870fe95f1951d7c30ea6068e187b9dededd (patch) | |
| tree | 6d11632353ff4fb07133625ec5031b135b1e2882 /indra/llmath/llvolume.cpp | |
| parent | d182b9fb82b9c63f41d81bc80dbbfe627475facf (diff) | |
QAR-1142 merging 1.22 RC0-RC4 changes.
svn merge -c 106471 svn+ssh://svn.lindenlab.com/svn/linden/qa/viewer_1-22-106055_merge
Diffstat (limited to 'indra/llmath/llvolume.cpp')
| -rw-r--r-- | indra/llmath/llvolume.cpp | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp index ba0cfa6ff5..8cdb43db46 100644 --- a/indra/llmath/llvolume.cpp +++ b/indra/llmath/llvolume.cpp @@ -1759,13 +1759,24 @@ BOOL LLVolume::generate() if (regenPath || regenProf ) { - sNumMeshPoints -= mMesh.size(); - mMesh.resize(mProfilep->mProfile.size() * mPathp->mPath.size()); - sNumMeshPoints += mMesh.size(); - S32 sizeS = mPathp->mPath.size(); S32 sizeT = mProfilep->mProfile.size(); + //debug info + if((U32)(sizeS * sizeT) > (1u << 20)) + { + llinfos << "regenPath: " << (S32)regenPath << " regenProf: " << (S32)regenProf << llendl ; + llinfos << "sizeS: " << sizeS << " sizeT: " << sizeT << llendl ; + llinfos << "path_detail : " << path_detail << " split: " << split << " profile_detail: " << profile_detail << llendl ; + llinfos << mParams << llendl ; + + llerrs << "LLVolume corrupted!" << llendl ; + } + + sNumMeshPoints -= mMesh.size(); + mMesh.resize(sizeT * sizeS); + sNumMeshPoints += mMesh.size(); + //generate vertex positions // Run along the path. |