diff options
| author | Dave Parks <davep@lindenlab.com> | 2010-02-19 16:17:57 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2010-02-19 16:17:57 -0600 |
| commit | e09d45aef8e2d2167e2020a328c0606c8c2f492c (patch) | |
| tree | a245d9b0e78eac35a38435e660f746ffbe152f33 /indra/llmath/llvolume.cpp | |
| parent | debf4374dff7e630e632105867700499e5a4fac8 (diff) | |
| parent | 237f1a1ba362aa2dfd9bb386e431713bdfcad2dc (diff) | |
merge
Diffstat (limited to 'indra/llmath/llvolume.cpp')
| -rw-r--r-- | indra/llmath/llvolume.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp index 7c98536e72..33a00b80ca 100644 --- a/indra/llmath/llvolume.cpp +++ b/indra/llmath/llvolume.cpp @@ -5619,6 +5619,10 @@ void LLVolumeFace::appendFace(const LLVolumeFace& face, LLMatrix4& mat, LLMatrix { U16 offset = mVertices.size(); + if (face.mVertices.size() + mVertices.size() > 65536) + { + llerrs << "Cannot append face -- 16-bit overflow will occur." << llendl; + } for (U32 i = 0; i < face.mVertices.size(); ++i) { |