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

1 files changed, 3 insertions, 3 deletions

diff --git a/indra/newview/llsurface.cpp b/indra/newview/llsurface.cpp
index dcb8f6d5b1..a27f0e2254 100644
--- a/indra/newview/llsurface.cpp
+++ b/indra/newview/llsurface.cpp
@@ -253,7 +253,7 @@ void LLSurface::createSTexture()
 		mSTexturep = new LLViewerImage(raw, FALSE);
 		mSTexturep->dontDiscard();
 		gGL.getTexUnit(0)->bind(mSTexturep.get());
-		mSTexturep->setClamp(TRUE, TRUE);
+		mSTexturep->setAddressMode(LLTexUnit::TAM_CLAMP);
 		gImageList.addImage(mSTexturep);
 	}
 }
@@ -278,7 +278,7 @@ void LLSurface::createWaterTexture()
 		mWaterTexturep = new LLViewerImage(raw, FALSE);
 		mWaterTexturep->dontDiscard();
 		gGL.getTexUnit(0)->bind(mWaterTexturep.get());
-		mWaterTexturep->setClamp(TRUE, TRUE);
+		mWaterTexturep->setAddressMode(LLTexUnit::TAM_CLAMP);
 		gImageList.addImage(mWaterTexturep);
 	}
 }
@@ -299,7 +299,7 @@ void LLSurface::initTextures()
 	{
 		createWaterTexture();
 		mWaterObjp = (LLVOWater *)gObjectList.createObjectViewer(LLViewerObject::LL_VO_WATER, mRegionp);
-		gPipeline.addObject(mWaterObjp);
+		gPipeline.createObject(mWaterObjp);
 		LLVector3d water_pos_global = from_region_handle(mRegionp->getHandle());
 		water_pos_global += LLVector3d(128.0, 128.0, DEFAULT_WATER_HEIGHT);
 		mWaterObjp->setPositionGlobal(water_pos_global);