summaryrefslogtreecommitdiff
path: root/indra/llmath
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2010-02-17 18:08:00 -0600
committerDave Parks <davep@lindenlab.com>2010-02-17 18:08:00 -0600
commitee8036712847315141c78d37646d629796442d09 (patch)
treee00bbdb539ebca6b4ebd104abf9342f601f0b679 /indra/llmath
parent161aff8e86ae690e6ba4124c9433bfed5025b133 (diff)
16-bit limit awareness when consolidating models.
Diffstat (limited to 'indra/llmath')
-rw-r--r--indra/llmath/llvolume.cpp4
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)
{