Merge branch 'sl-base-1.22' into next

Conflicts:
	linden/indra/newview/English.lproj/InfoPlist.strings
	linden/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml

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 @@
  *
  * $LicenseInfo:firstyear=2006&license=viewergpl$
  * 
- * Copyright (c) 2006-2008, Linden Research, Inc.
+ * Copyright (c) 2006-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -66,7 +66,7 @@ void LLMapLayerResponder::result(const LLSD& result)
                 new_layer.LayerDefined = TRUE;
                 new_layer.LayerImageID = layer_data["ImageID"];
                 new_layer.LayerImage = gImageList.getImage(new_layer.LayerImageID, MIPMAP_TRUE, FALSE);
-                new_layer.LayerImage->bindTexture(0);
+                gGL.getTexUnit(0)->bind(new_layer.LayerImage.get());
                 new_layer.LayerImage->setClamp(TRUE, TRUE);
                 
                 new_layer.LayerExtents.mLeft = layer_data["Left"];
@@ -163,7 +163,7 @@ 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->bindTexture(0);
+                                gGL.getTexUnit(0)->bind(siminfo->mCurrentImage.get());
                                 siminfo->mCurrentImage->setClamp(TRUE, TRUE);
                         
                                 if (siminfo->mMapImageID[2].notNull())