Merged Experimental branch (exp) back into main line (next).

Git thought many files (almost 100) had merge conflicts. But, after
resolving the conflicts (which were mostly trivial), almost all the
files turned out to be the same as in the exp branch. So, the
conflicts are not listed here. Check the diff between commit 244ffe8
and this commit to see what really changed.

8 files changed, 78 insertions, 43 deletions

diff --git a/linden/indra/llrender/llfont.cpp b/linden/indra/llrender/llfont.cpp
index dd33128..5ee3929 100644
--- a/linden/indra/llrender/llfont.cpp
+++ b/linden/indra/llrender/llfont.cpp
@@ -311,7 +311,7 @@ BOOL LLFont::addChar(const llwchar wch) const
                 // Try looking it up in the backup Unicode font
                 if (mFallbackFontp)
                 {
-                        //llinfos << "Trying to add glyph from fallback font!" << llendl
+                        //llinfos << "Trying to add glyph from fallback font!" << llendl;
                         LLFontList::iterator iter;
                         for(iter = mFallbackFontp->begin(); iter != mFallbackFontp->end(); iter++)
                         {
diff --git a/linden/indra/llrender/llfontgl.cpp b/linden/indra/llrender/llfontgl.cpp
index 5d3d6a7..306c6b9 100644
--- a/linden/indra/llrender/llfontgl.cpp
+++ b/linden/indra/llrender/llfontgl.cpp
@@ -42,6 +42,7 @@
 #include "llrender.h"
 #include "v4color.h"
 #include "llstl.h"
+#include "llfasttimer.h"
 
 const S32 BOLD_OFFSET = 1;
 
@@ -241,7 +242,8 @@ BOOL LLFontGL::initDefaultFonts(F32 screen_dpi, F32 x_scale, F32 y_scale,
         // This is primarily for error detection purposes.
         succ &= (NULL != getFontSansSerifSmall());
         succ &= (NULL != getFontSansSerif());
-        succ &= (NULL != getFontSansSerifBig());
+        succ &= (NULL != getFontSansSerifBigger());
+        succ &= (NULL != getFontSansSerifLarge());
         succ &= (NULL != getFontSansSerifHuge());
         succ &= (NULL != getFontSansSerifBold());
         succ &= (NULL != getFontMonospace());
@@ -312,7 +314,13 @@ LLFontGL* LLFontGL::getFontSansSerif()
 }
 
 //static
-LLFontGL* LLFontGL::getFontSansSerifBig()
+LLFontGL* LLFontGL::getFontSansSerifBigger()
+{
+        return getFont(LLFontDescriptor("SansSerif","Bigger",0));
+}
+
+//static
+LLFontGL* LLFontGL::getFontSansSerifLarge()
 {
         return getFont(LLFontDescriptor("SansSerif","Large",0));
 }
diff --git a/linden/indra/llrender/llfontgl.h b/linden/indra/llrender/llfontgl.h
index 6cb1727..e3a953b 100644
--- a/linden/indra/llrender/llfontgl.h
+++ b/linden/indra/llrender/llfontgl.h
@@ -233,7 +233,8 @@ public:
         static LLFontGL* getFontMonospace();
         static LLFontGL* getFontSansSerifSmall();
         static LLFontGL* getFontSansSerif();
-        static LLFontGL* getFontSansSerifBig();
+        static LLFontGL* getFontSansSerifBigger();
+        static LLFontGL* getFontSansSerifLarge();
         static LLFontGL* getFontSansSerifHuge();
         static LLFontGL* getFontSansSerifBold();
         static LLFontGL* getFontExtChar();
diff --git a/linden/indra/llrender/llfontregistry.cpp b/linden/indra/llrender/llfontregistry.cpp
index 28e38ce..c5923cd 100644
--- a/linden/indra/llrender/llfontregistry.cpp
+++ b/linden/indra/llrender/llfontregistry.cpp
@@ -107,7 +107,7 @@ bool removeSubString(std::string& str, const std::string& substr)
         size_t pos = str.find(substr);
         if (pos != string::npos)
         {
-                str.replace(pos,substr.length(),(const char *)NULL, 0);
+                str.erase(pos,substr.length());
                 return true;
         }
         return false;
diff --git a/linden/indra/llrender/llgl.cpp b/linden/indra/llrender/llgl.cpp
index 61194c4..4a4ff1b 100644
--- a/linden/indra/llrender/llgl.cpp
+++ b/linden/indra/llrender/llgl.cpp
@@ -547,46 +547,49 @@ void LLGLManager::shutdownGL()
 // these are used to turn software blending on. They appear in the Debug/Avatar menu
 // presence of vertex skinning/blending or vertex programs will set these to FALSE by default.
 
-extern LLCPUInfo gSysCPU;
-
 void LLGLManager::initExtensions()
 {
 #if LL_MESA_HEADLESS
-# if GL_ARB_multitexture
+# ifdef GL_ARB_multitexture
         mHasMultitexture = TRUE;
 # else
         mHasMultitexture = FALSE;
 # endif
-# if GL_ARB_texture_env_combine
-        mHasARBEnvCombine = TRUE;       
+# ifdef GL_ARB_texture_env_combine
+        mHasARBEnvCombine = TRUE;
 # else
         mHasARBEnvCombine = FALSE;
 # endif
-# if GL_ARB_texture_compression
+# ifdef GL_ARB_texture_compression
         mHasCompressedTextures = TRUE;
 # else
         mHasCompressedTextures = FALSE;
 # endif
-# if GL_ARB_vertex_buffer_object
+# ifdef GL_ARB_vertex_buffer_object
         mHasVertexBufferObject = TRUE;
 # else
         mHasVertexBufferObject = FALSE;
 # endif
-# if GL_EXT_framebuffer_object
+# ifdef GL_EXT_framebuffer_object
         mHasFramebufferObject = TRUE;
 # else
         mHasFramebufferObject = FALSE;
 # endif
-# if GL_EXT_framebuffer_multisample
+# ifdef GL_EXT_framebuffer_multisample
         mHasFramebufferMultisample = TRUE;
 # else
         mHasFramebufferMultisample = FALSE;
 # endif
-# if GL_ARB_draw_buffers
+# ifdef GL_ARB_draw_buffers
         mHasDrawBuffers = TRUE;
 #else
         mHasDrawBuffers = FALSE;
 # endif
+# if defined(GL_NV_depth_clamp) || defined(GL_ARB_depth_clamp)
+        mHasDepthClamp = TRUE;
+#else
+        mHasDepthClamp = FALSE;
+#endif
         mHasMipMapGeneration = FALSE;
         mHasSeparateSpecularColor = FALSE;
         mHasAnisotropic = FALSE;
@@ -612,6 +615,7 @@ void LLGLManager::initExtensions()
                 && ExtensionExists("GL_EXT_packed_depth_stencil", gGLHExts.mSysExts);
         mHasFramebufferMultisample = mHasFramebufferObject && ExtensionExists("GL_EXT_framebuffer_multisample", gGLHExts.mSysExts);
         mHasDrawBuffers = ExtensionExists("GL_ARB_draw_buffers", gGLHExts.mSysExts);
+        mHasDepthClamp = ExtensionExists("GL_ARB_depth_clamp", gGLHExts.mSysExts) || ExtensionExists("GL_NV_depth_clamp", gGLHExts.mSysExts);
 #if !LL_DARWIN
         mHasPointParameters = !mIsATI && ExtensionExists("GL_ARB_point_parameters", gGLHExts.mSysExts);
 #endif
@@ -634,6 +638,7 @@ void LLGLManager::initExtensions()
                 mHasFramebufferObject = FALSE;
                 mHasFramebufferMultisample = FALSE;
                 mHasDrawBuffers = FALSE;
+                mHasDepthClamp = FALSE;
                 mHasMipMapGeneration = FALSE;
                 mHasSeparateSpecularColor = FALSE;
                 mHasAnisotropic = FALSE;
@@ -685,10 +690,11 @@ void LLGLManager::initExtensions()
                 if (strchr(blacklist,'q')) mHasFramebufferObject = FALSE;//S
                 if (strchr(blacklist,'r')) mHasDrawBuffers = FALSE;//S
                 if (strchr(blacklist,'s')) mHasFramebufferMultisample = FALSE;
+                if (strchr(blacklist,'t')) mHasDepthClamp = FALSE;
 
         }
 #endif // LL_LINUX || LL_SOLARIS
-        
+
         if (!mHasMultitexture)
         {
                 LL_INFOS("RenderInit") << "Couldn't initialize multitexturing" << LL_ENDL;
@@ -1773,7 +1779,7 @@ LLGLDepthTest::~LLGLDepthTest()
         }
 }
 
-LLGLClampToFarClip::LLGLClampToFarClip(glh::matrix4f P)
+LLGLSquashToFarClip::LLGLSquashToFarClip(glh::matrix4f P)
 {
         for (U32 i = 0; i < 4; i++)
         {
@@ -1786,7 +1792,7 @@ LLGLClampToFarClip::LLGLClampToFarClip(glh::matrix4f P)
         glMatrixMode(GL_MODELVIEW);
 }
 
-LLGLClampToFarClip::~LLGLClampToFarClip()
+LLGLSquashToFarClip::~LLGLSquashToFarClip()
 {
         glMatrixMode(GL_PROJECTION);
         glPopMatrix();
diff --git a/linden/indra/llrender/llgl.h b/linden/indra/llrender/llgl.h
index 00ff1e2..cc7ebff 100644
--- a/linden/indra/llrender/llgl.h
+++ b/linden/indra/llrender/llgl.h
@@ -88,6 +88,7 @@ public:
         BOOL mHasOcclusionQuery;
         BOOL mHasPointParameters;
         BOOL mHasDrawBuffers;
+        BOOL mHasDepthClamp;
 
         // Other extensions.
         BOOL mHasAnisotropic;
@@ -306,11 +307,11 @@ private:
   leaves this class.
   Does not stack.
 */
-class LLGLClampToFarClip
+class LLGLSquashToFarClip
 {
 public:
-        LLGLClampToFarClip(glh::matrix4f projection);
-        ~LLGLClampToFarClip();
+        LLGLSquashToFarClip(glh::matrix4f projection);
+        ~LLGLSquashToFarClip();
 };
 
 /*
diff --git a/linden/indra/llrender/llglheaders.h b/linden/indra/llrender/llglheaders.h
index c7178a5..9e3ae9d 100644
--- a/linden/indra/llrender/llglheaders.h
+++ b/linden/indra/llrender/llglheaders.h
@@ -819,5 +819,15 @@ extern void glGetBufferPointervARB (GLenum, GLenum, GLvoid* *);
 
 #endif // LL_MESA / LL_WINDOWS / LL_DARWIN
 
+// Even when GL_ARB_depth_clamp is available in the driver, the (correct)
+// headers, and therefore GL_DEPTH_CLAMP might not be defined.
+// In that case GL_DEPTH_CLAMP_NV should be defined, but why not just
+// use the known numeric.
+//
+// To avoid #ifdef's in the code. Just define this here.
+#ifndef GL_DEPTH_CLAMP
+// Probably (still) called GL_DEPTH_CLAMP_NV.
+#define GL_DEPTH_CLAMP 0x864F
+#endif
 
 #endif // LL_LLGLHEADERS_H
diff --git a/linden/indra/llrender/llimagegl.cpp b/linden/indra/llrender/llimagegl.cpp
index 7cd4dd7..c63d7ad 100644
--- a/linden/indra/llrender/llimagegl.cpp
+++ b/linden/indra/llrender/llimagegl.cpp
@@ -375,45 +375,54 @@ LLImageGL::~LLImageGL()
 
 void LLImageGL::init(BOOL usemipmaps)
 {
-#ifdef DEBUG_MISS
-        mMissed                         = FALSE;
-#endif
+        // keep these members in the same order as declared in llimagehl.h
+        // so that it is obvious by visual inspection if we forgot to
+        // init a field.
 
-        mPickMask                 = NULL;
-        mPickMaskSize     = 0;
-        mTextureState       = NO_DELETE ;
-        mTextureMemory    = 0;
-        mLastBindTime     = 0.f;
+        mTextureMemory = 0;
+        mLastBindTime = 0.f;
+
+        mPickMask = NULL;
+        mPickMaskSize = 0;
+        mUseMipMaps = usemipmaps;
+        mHasExplicitFormat = FALSE;
+        mAutoGenMips = FALSE;
+
+        mIsMask = FALSE;
+
+        mGLTextureCreated = false;
+        mTexName = 0;
+        mWidth = 0;
+        mHeight = 0;
+        mCurrentDiscardLevel = -1;      
         
         mTarget                   = GL_TEXTURE_2D;
         mBindTarget               = LLTexUnit::TT_TEXTURE;
-        mUseMipMaps               = usemipmaps;
         mHasMipMaps               = false;
-        mAutoGenMips      = FALSE;
-        mTexName          = 0;
-        mIsResident       = 0;
+
+        mIsResident = 0;
+
+        mComponents = 0;
+        mMaxDiscardLevel = MAX_DISCARD_LEVEL;
 
         mTexOptionsDirty = true;
         mAddressMode = LLTexUnit::TAM_WRAP;
         mFilterOption = LLTexUnit::TFO_ANISOTROPIC;
-        mWidth                          = 0;
-        mHeight                         = 0;
-        mComponents                     = 0;
-        
-        mMaxDiscardLevel = MAX_DISCARD_LEVEL;
-        mCurrentDiscardLevel = -1;
-        mDontDiscard = FALSE;
         
         mFormatInternal = -1;
         mFormatPrimary = (LLGLenum) 0;
         mFormatType = GL_UNSIGNED_BYTE;
         mFormatSwapBytes = FALSE;
-        mHasExplicitFormat = FALSE;
 
-        mGLTextureCreated = FALSE ;
+#ifdef DEBUG_MISS
+        mMissed                         = FALSE;
+#endif
 
-        mIsMask = FALSE;
         mCategory = -1 ;
+        
+        //LLTexture stuff
+        mDontDiscard = FALSE;
+        mTextureState       = NO_DELETE ;
 }
 
 void LLImageGL::cleanup()