diff options
author | McCabe Maxsted | 2009-06-07 23:14:43 -0700 |
---|---|---|
committer | McCabe Maxsted | 2009-06-07 23:14:43 -0700 |
commit | e0a70bea805cf07b92efabca15ffe56a777f90ac (patch) | |
tree | 2c93d38e210832e737d09cff7561373d8d5453b2 /linden/indra/newview/llmapresponders.cpp | |
parent | 1.1 version final (diff) | |
parent | Merge branch 'sl-base-1.22' into next (diff) | |
download | meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.zip meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.gz meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.bz2 meta-impy-e0a70bea805cf07b92efabca15ffe56a777f90ac.tar.xz |
Moved base up to 1.22
Diffstat (limited to 'linden/indra/newview/llmapresponders.cpp')
-rw-r--r-- | linden/indra/newview/llmapresponders.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/llmapresponders.cpp b/linden/indra/newview/llmapresponders.cpp index d16bc78..7654e9b 100644 --- a/linden/indra/newview/llmapresponders.cpp +++ b/linden/indra/newview/llmapresponders.cpp | |||
@@ -4,7 +4,7 @@ | |||
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2006&license=viewergpl$ | 5 | * $LicenseInfo:firstyear=2006&license=viewergpl$ |
6 | * | 6 | * |
7 | * Copyright (c) 2006-2008, Linden Research, Inc. | 7 | * Copyright (c) 2006-2009, Linden Research, Inc. |
8 | * | 8 | * |
9 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
10 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
@@ -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()) |