Second Life viewer sources 1.23.0-RC

1 files changed, 4 insertions, 3 deletions

diff --git a/linden/indra/newview/llmapresponders.cpp b/linden/indra/newview/llmapresponders.cpp
index 7654e9b..140f390 100644
--- a/linden/indra/newview/llmapresponders.cpp
+++ b/linden/indra/newview/llmapresponders.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -67,7 +68,7 @@ void LLMapLayerResponder::result(const LLSD& result)
                 new_layer.LayerImageID = layer_data["ImageID"];
                 new_layer.LayerImage = gImageList.getImage(new_layer.LayerImageID, MIPMAP_TRUE, FALSE);
                 gGL.getTexUnit(0)->bind(new_layer.LayerImage.get());
-                new_layer.LayerImage->setClamp(TRUE, TRUE);
+                new_layer.LayerImage->setAddressMode(LLTexUnit::TAM_CLAMP);
                 
                 new_layer.LayerExtents.mLeft = layer_data["Left"];
                 new_layer.LayerExtents.mRight = layer_data["Right"];
@@ -163,8 +164,8 @@ void LLMapLayerResponder::result(const LLSD& result)
                                 siminfo->mWaterHeight = (F32) water_height;
                                 siminfo->mMapImageID[agent_flags] = image_id;
                                 siminfo->mCurrentImage = gImageList.getImage(siminfo->mMapImageID[LLWorldMap::getInstance()->mCurrentMap], MIPMAP_TRUE, FALSE);
+                                siminfo->mCurrentImage->setAddressMode(LLTexUnit::TAM_CLAMP);
                                 gGL.getTexUnit(0)->bind(siminfo->mCurrentImage.get());
-                                siminfo->mCurrentImage->setClamp(TRUE, TRUE);
                         
                                 if (siminfo->mMapImageID[2].notNull())
                                 {