diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-14 17:36:13 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-07-14 17:36:13 +0100 |
| commit | 2acfe2547a45cb15420c5dad18d4e4e2e83f05a5 (patch) | |
| tree | b223968d7b6113387213b196aa25c37b06407d52 /indra/newview/llsurface.cpp | |
| parent | 4339600d43601f07d01c676cce5da17c2758c4cb (diff) | |
EXT-7455 PARTIAL viewer crash in LLSurface::getWaterHeight
Somewhere between a band-aid and a real fix. Entirely speculative since there is no repro.
Diffstat (limited to 'indra/newview/llsurface.cpp')
| -rw-r--r-- | indra/newview/llsurface.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
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); } |