aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llmapresponders.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-12-01 17:39:58 -0600
committerJacek Antonelli2008-12-01 17:40:06 -0600
commit7abecb48babe6a6f09bf6692ba55076546cfced9 (patch)
tree8d18a88513fb97adf32c10aae78f4be1984942db /linden/indra/newview/llmapresponders.cpp
parentSecond Life viewer sources 1.21.6 (diff)
downloadmeta-impy-7abecb48babe6a6f09bf6692ba55076546cfced9.zip
meta-impy-7abecb48babe6a6f09bf6692ba55076546cfced9.tar.gz
meta-impy-7abecb48babe6a6f09bf6692ba55076546cfced9.tar.bz2
meta-impy-7abecb48babe6a6f09bf6692ba55076546cfced9.tar.xz
Second Life viewer sources 1.22.0-RC
Diffstat (limited to 'linden/indra/newview/llmapresponders.cpp')
-rw-r--r--linden/indra/newview/llmapresponders.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/llmapresponders.cpp b/linden/indra/newview/llmapresponders.cpp
index d16bc78..898ac58 100644
--- a/linden/indra/newview/llmapresponders.cpp
+++ b/linden/indra/newview/llmapresponders.cpp
@@ -66,7 +66,7 @@ void LLMapLayerResponder::result(const LLSD& result)
66 new_layer.LayerDefined = TRUE; 66 new_layer.LayerDefined = TRUE;
67 new_layer.LayerImageID = layer_data["ImageID"]; 67 new_layer.LayerImageID = layer_data["ImageID"];
68 new_layer.LayerImage = gImageList.getImage(new_layer.LayerImageID, MIPMAP_TRUE, FALSE); 68 new_layer.LayerImage = gImageList.getImage(new_layer.LayerImageID, MIPMAP_TRUE, FALSE);
69 new_layer.LayerImage->bindTexture(0); 69 gGL.getTexUnit(0)->bind(new_layer.LayerImage.get());
70 new_layer.LayerImage->setClamp(TRUE, TRUE); 70 new_layer.LayerImage->setClamp(TRUE, TRUE);
71 71
72 new_layer.LayerExtents.mLeft = layer_data["Left"]; 72 new_layer.LayerExtents.mLeft = layer_data["Left"];
@@ -163,7 +163,7 @@ void LLMapLayerResponder::result(const LLSD& result)
163 siminfo->mWaterHeight = (F32) water_height; 163 siminfo->mWaterHeight = (F32) water_height;
164 siminfo->mMapImageID[agent_flags] = image_id; 164 siminfo->mMapImageID[agent_flags] = image_id;
165 siminfo->mCurrentImage = gImageList.getImage(siminfo->mMapImageID[LLWorldMap::getInstance()->mCurrentMap], MIPMAP_TRUE, FALSE); 165 siminfo->mCurrentImage = gImageList.getImage(siminfo->mMapImageID[LLWorldMap::getInstance()->mCurrentMap], MIPMAP_TRUE, FALSE);
166 siminfo->mCurrentImage->bindTexture(0); 166 gGL.getTexUnit(0)->bind(siminfo->mCurrentImage.get());
167 siminfo->mCurrentImage->setClamp(TRUE, TRUE); 167 siminfo->mCurrentImage->setClamp(TRUE, TRUE);
168 168
169 if (siminfo->mMapImageID[2].notNull()) 169 if (siminfo->mMapImageID[2].notNull())