1 files changed, 7 insertions, 0 deletions

diff --git a/linden/indra/newview/llvlcomposition.cpp b/linden/indra/newview/llvlcomposition.cpp
index af0fe96..370bf24 100644
--- a/linden/indra/newview/llvlcomposition.cpp
+++ b/linden/indra/newview/llvlcomposition.cpp
@@ -126,6 +126,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 );