aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llmapresponders.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llmapresponders.cpp')
-rw-r--r--linden/indra/newview/llmapresponders.cpp7
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 @@
17 * There are special exceptions to the terms and conditions of the GPL as 17 * There are special exceptions to the terms and conditions of the GPL as
18 * it is applied to this Source Code. View the full text of the exception 18 * it is applied to this Source Code. View the full text of the exception
19 * in the file doc/FLOSS-exception.txt in this software distribution, or 19 * in the file doc/FLOSS-exception.txt in this software distribution, or
20 * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception 20 * online at
21 * http://secondlifegrid.net/programs/open_source/licensing/flossexception
21 * 22 *
22 * By copying, modifying or distributing this software, you acknowledge 23 * By copying, modifying or distributing this software, you acknowledge
23 * that you have read and understood your obligations described above, 24 * that you have read and understood your obligations described above,
@@ -67,7 +68,7 @@ void LLMapLayerResponder::result(const LLSD& result)
67 new_layer.LayerImageID = layer_data["ImageID"]; 68 new_layer.LayerImageID = layer_data["ImageID"];
68 new_layer.LayerImage = gImageList.getImage(new_layer.LayerImageID, MIPMAP_TRUE, FALSE); 69 new_layer.LayerImage = gImageList.getImage(new_layer.LayerImageID, MIPMAP_TRUE, FALSE);
69 gGL.getTexUnit(0)->bind(new_layer.LayerImage.get()); 70 gGL.getTexUnit(0)->bind(new_layer.LayerImage.get());
70 new_layer.LayerImage->setClamp(TRUE, TRUE); 71 new_layer.LayerImage->setAddressMode(LLTexUnit::TAM_CLAMP);
71 72
72 new_layer.LayerExtents.mLeft = layer_data["Left"]; 73 new_layer.LayerExtents.mLeft = layer_data["Left"];
73 new_layer.LayerExtents.mRight = layer_data["Right"]; 74 new_layer.LayerExtents.mRight = layer_data["Right"];
@@ -163,8 +164,8 @@ void LLMapLayerResponder::result(const LLSD& result)
163 siminfo->mWaterHeight = (F32) water_height; 164 siminfo->mWaterHeight = (F32) water_height;
164 siminfo->mMapImageID[agent_flags] = image_id; 165 siminfo->mMapImageID[agent_flags] = image_id;
165 siminfo->mCurrentImage = gImageList.getImage(siminfo->mMapImageID[LLWorldMap::getInstance()->mCurrentMap], MIPMAP_TRUE, FALSE); 166 siminfo->mCurrentImage = gImageList.getImage(siminfo->mMapImageID[LLWorldMap::getInstance()->mCurrentMap], MIPMAP_TRUE, FALSE);
167 siminfo->mCurrentImage->setAddressMode(LLTexUnit::TAM_CLAMP);
166 gGL.getTexUnit(0)->bind(siminfo->mCurrentImage.get()); 168 gGL.getTexUnit(0)->bind(siminfo->mCurrentImage.get());
167 siminfo->mCurrentImage->setClamp(TRUE, TRUE);
168 169
169 if (siminfo->mMapImageID[2].notNull()) 170 if (siminfo->mMapImageID[2].notNull())
170 { 171 {