summaryrefslogtreecommitdiff
path: root/indra/newview/llvlcomposition.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llvlcomposition.cpp')
-rw-r--r--indra/newview/llvlcomposition.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llvlcomposition.cpp b/indra/newview/llvlcomposition.cpp
index de67506e3f..f2cf4b3dc6 100644
--- a/indra/newview/llvlcomposition.cpp
+++ b/indra/newview/llvlcomposition.cpp
@@ -106,6 +106,13 @@ BOOL LLVLComposition::generateHeights(const F32 x, const F32 y,
}
llassert(mSurfacep);
+
+ if (!mSurfacep || !mSurfacep->getRegion())
+ {
+ // We don't always have the region yet here....
+ return FALSE;
+ }
+
S32 x_begin, y_begin, x_end, y_end;
x_begin = llround( x * mScaleInv );