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, 1 deletions

diff --git a/linden/indra/llrender/llcubemap.h b/linden/indra/llrender/llcubemap.h
index 45bfa16..8c83e6e 100644
--- a/linden/indra/llrender/llcubemap.h
+++ b/linden/indra/llrender/llcubemap.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2002&license=viewergpl$
  * 
- * Copyright (c) 2002-2008, Linden Research, Inc.
+ * Copyright (c) 2002-2009, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -53,6 +53,7 @@ public:
         
         void enableTexture(S32 stage);
         void enableTextureCoords(S32 stage);
+        S32      getStage(void) { return mTextureStage; }
         
         void disable(void);
         void disableTexture(void);
@@ -77,6 +78,7 @@ public:
         static bool sUseCubeMaps;
 
 protected:
+        friend class LLTexUnit;
         ~LLCubeMap();
         LLGLenum mTargets[6];
         LLPointer<LLImageGL> mImages[6];