diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-15 13:25:55 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-15 13:25:55 +0300 |
| commit | 1e5c85259ecab2351a267e389fdb8b0f5862286c (patch) | |
| tree | cd14a402fb527f8fed2d66dd948a705c90f86fcb /indra/newview/llsurface.cpp | |
| parent | 8dea26aa6c11b7d7b77e22c7f0b398d1ba659bce (diff) | |
| parent | 08647d14c256cd6959a9853dc194614771a19501 (diff) | |
Merge from default branch
--HG--
branch : product-engine
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); } |