From 2acfe2547a45cb15420c5dad18d4e4e2e83f05a5 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Wed, 14 Jul 2010 17:36:13 +0100 Subject: EXT-7455 PARTIAL viewer crash in LLSurface::getWaterHeight Somewhere between a band-aid and a real fix. Entirely speculative since there is no repro. --- indra/newview/llsurface.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/indra/newview/llsurface.cpp b/indra/newview/llsurface.cpp index ddb5d08e07..cecc135951 100644 --- a/indra/newview/llsurface.cpp +++ b/indra/newview/llsurface.cpp @@ -158,6 +158,7 @@ void LLSurface::initClasses() void LLSurface::setRegion(LLViewerRegion *regionp) { mRegionp = regionp; + mWaterObjp = NULL; // depends on regionp, needs recreating } // Assumes that arguments are powers of 2, and that @@ -958,6 +959,7 @@ LLSurfacePatch *LLSurface::resolvePatchRegion(const LLVector3 &pos_region) const LLSurfacePatch *LLSurface::resolvePatchGlobal(const LLVector3d &pos_global) const { + llassert(mRegionp); LLVector3 pos_region = mRegionp->getPosRegionFromGlobal(pos_global); return resolvePatchRegion(pos_region); } -- cgit v1.2.3