diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-07-30 18:07:35 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-07-30 18:07:35 -0700 |
| commit | 854e6acb424faa843f9bff7875927fcfec2cb1d4 (patch) | |
| tree | 5a5f21c59ba6eb1c6551bb37538f3125c2c4ccbb /indra/newview/llsurface.cpp | |
| parent | 547bcc907389aeb1a3d974025b621e98d1178714 (diff) | |
| parent | afaa076b7dd300a2836205fe6eb9ba5ab08bfb28 (diff) | |
Merge with dessie/viewer-release
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); } |