diff options
| author | Brad Kittenbrink <brad@lindenlab.com> | 2009-02-18 21:10:16 +0000 |
|---|---|---|
| committer | Brad Kittenbrink <brad@lindenlab.com> | 2009-02-18 21:10:16 +0000 |
| commit | abdc99f21b542c4fea67030ddbd7166c9d1c6c63 (patch) | |
| tree | 3e984e405adfdec189ca8a047daca5250737ffbf /indra/newview/llworld.cpp | |
| parent | 34412f0530cf6a411b4de906a8e9da59cbcb3a85 (diff) | |
Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2)
svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833
Diffstat (limited to 'indra/newview/llworld.cpp')
| -rw-r--r-- | indra/newview/llworld.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp index 4239996017..f11ef97b55 100644 --- a/indra/newview/llworld.cpp +++ b/indra/newview/llworld.cpp @@ -111,7 +111,7 @@ LLWorld::LLWorld() : mDefaultWaterTexturep = new LLViewerImage(raw, FALSE); gGL.getTexUnit(0)->bind(mDefaultWaterTexturep.get()); - mDefaultWaterTexturep->setClamp(TRUE, TRUE); + mDefaultWaterTexturep->setAddressMode(LLTexUnit::TAM_CLAMP); } @@ -872,7 +872,7 @@ void LLWorld::updateWaterObjects() y + rwidth/2, 256.f+DEFAULT_WATER_HEIGHT)); waterp->setScale(LLVector3((F32)rwidth, (F32)rwidth, 512.f)); - gPipeline.addObject(waterp); + gPipeline.createObject(waterp); mHoleWaterObjects.push_back(waterp); } } @@ -923,7 +923,7 @@ void LLWorld::updateWaterObjects() waterp = mEdgeWaterObjects[dir]; waterp->setUseTexture(FALSE); waterp->setIsEdgePatch(TRUE); - gPipeline.addObject(waterp); + gPipeline.createObject(waterp); } waterp->setRegion(gAgent.getRegion()); |