summaryrefslogtreecommitdiff
path: root/indra/newview/llvowater.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2012-06-28 13:22:04 -0500
committerDave Parks <davep@lindenlab.com>2012-06-28 13:22:04 -0500
commited72fd0ae98671f1cfce3c975b93e1f760fc40f0 (patch)
tree10596d0f2040e9a0414e8a9f14d1269b58942264 /indra/newview/llvowater.cpp
parent90547ff411db177bf6424ca553449a81a808fc0f (diff)
parenta1d0d67e05c45bdc1a7a8bb0aad79772a2a94f6e (diff)
merge
Diffstat (limited to 'indra/newview/llvowater.cpp')
-rw-r--r--indra/newview/llvowater.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llvowater.cpp b/indra/newview/llvowater.cpp
index cd78157944..942eff6171 100644
--- a/indra/newview/llvowater.cpp
+++ b/indra/newview/llvowater.cpp
@@ -146,6 +146,10 @@ BOOL LLVOWater::updateGeometry(LLDrawable *drawable)
drawable->addFace(poolp, NULL);
}
face = drawable->getFace(0);
+ if (!face)
+ {
+ return TRUE;
+ }
// LLVector2 uvs[4];
// LLVector3 vtx[4];