Second Life viewer sources 1.15.1.3

3 files changed, 44 insertions, 15 deletions

diff --git a/linden/indra/llrender/llfontgl.cpp b/linden/indra/llrender/llfontgl.cpp
index 7ee89c7..23f02c2 100644
--- a/linden/indra/llrender/llfontgl.cpp
+++ b/linden/indra/llrender/llfontgl.cpp
@@ -70,7 +70,7 @@ const F32 PIXEL_BORDER_THRESHOLD = 0.0001f;
 const F32 PIXEL_CORRECTION_DISTANCE = 0.01f;
 
 const F32 PAD_AMT = 0.5f;
-const F32 DROP_SHADOW_STRENGTH = 0.3f;
+const F32 DROP_SHADOW_SOFT_STRENGTH = 0.3f;
 
 F32 llfont_round_x(F32 x)
 {
@@ -106,6 +106,14 @@ U8 LLFontGL::getStyleFromString(const LLString &style)
         {
                 ret |= UNDERLINE;
         }
+        if (style.find("SHADOW") != style.npos)
+        {
+                ret |= DROP_SHADOW;
+        }
+        if (style.find("SOFT_SHADOW") != style.npos)
+        {
+                ret |= DROP_SHADOW_SOFT;
+        }
         return ret;
 }
 
@@ -571,14 +579,14 @@ S32 LLFontGL::render(const LLWString &wstr,
         }
 
         F32 drop_shadow_strength = 0.f;
-        if (style & DROP_SHADOW)
+        if (style & (DROP_SHADOW | DROP_SHADOW_SOFT))
         {
                 F32 luminance;
                 color.calcHSL(NULL, NULL, &luminance);
-                drop_shadow_strength = clamp_rescale(luminance, 0.35f, 0.6f, 0.f, DROP_SHADOW_STRENGTH);
+                drop_shadow_strength = clamp_rescale(luminance, 0.35f, 0.6f, 0.f, 1.f);
                 if (luminance < 0.35f)
                 {
-                        style = style & ~DROP_SHADOW;
+                        style = style & ~(DROP_SHADOW | DROP_SHADOW_SOFT);
                 }
         }
 
@@ -769,6 +777,7 @@ S32 LLFontGL::render(const LLWString &wstr,
                         if (!fgi)
                         {
                                 llerrs << "Missing Glyph Info" << llendl;
+                                break;
                         }
                         if ((start_x + scaled_max_pixels) < (cur_x + fgi->mXBearing + fgi->mWidth))
                         {
@@ -1334,10 +1343,10 @@ void LLFontGL::drawGlyph(const LLRectf& screen_rect, const LLRectf& uv_rect, con
                                 renderQuad(screen_rect_offset, uv_rect, slant_offset);
                         }
                 }
-                else if (style & DROP_SHADOW)
+                else if (style & DROP_SHADOW_SOFT)
                 {
                         LLColor4 shadow_color = LLFontGL::sShadowColor;
-                        shadow_color.mV[VALPHA] = color.mV[VALPHA] * drop_shadow_strength;
+                        shadow_color.mV[VALPHA] = color.mV[VALPHA] * drop_shadow_strength * DROP_SHADOW_SOFT_STRENGTH;
                         glColor4fv(shadow_color.mV);
                         for (S32 pass = 0; pass < 5; pass++)
                         {
@@ -1367,6 +1376,17 @@ void LLFontGL::drawGlyph(const LLRectf& screen_rect, const LLRectf& uv_rect, con
                         glColor4fv(color.mV);
                         renderQuad(screen_rect, uv_rect, slant_offset);
                 }
+                else if (style & DROP_SHADOW)
+                {
+                        LLColor4 shadow_color = LLFontGL::sShadowColor;
+                        shadow_color.mV[VALPHA] = color.mV[VALPHA] * drop_shadow_strength;
+                        glColor4fv(shadow_color.mV);
+                        LLRectf screen_rect_shadow = screen_rect;
+                        screen_rect_shadow.translate(1.f, -1.f);
+                        renderQuad(screen_rect_shadow, uv_rect, slant_offset);
+                        glColor4fv(color.mV);
+                        renderQuad(screen_rect, uv_rect, slant_offset);
+                }
                 else // normal rendering
                 {
                         glColor4fv(color.mV);
diff --git a/linden/indra/llrender/llfontgl.h b/linden/indra/llrender/llfontgl.h
index 98a7a55..2cd62c6 100644
--- a/linden/indra/llrender/llfontgl.h
+++ b/linden/indra/llrender/llfontgl.h
@@ -65,7 +65,8 @@ public:
                 BOLD = 1,
                 ITALIC = 2,
                 UNDERLINE = 4,
-                DROP_SHADOW = 8
+                DROP_SHADOW = 8,
+                DROP_SHADOW_SOFT = 16
         };
         
         // Takes a string with potentially several flags, i.e. "NORMAL|BOLD|ITALIC"
diff --git a/linden/indra/llrender/llimagegl.cpp b/linden/indra/llrender/llimagegl.cpp
index 464507e..e2c4a59 100644
--- a/linden/indra/llrender/llimagegl.cpp
+++ b/linden/indra/llrender/llimagegl.cpp
@@ -129,19 +129,27 @@ void LLImageGL::bindExternalTexture(LLGLuint gl_name, S32 stage, LLGLenum bind_t
 // static
 void LLImageGL::unbindTexture(S32 stage, LLGLenum bind_target)
 {
-        glActiveTextureARB(GL_TEXTURE0_ARB + stage);
-        glClientActiveTextureARB(GL_TEXTURE0_ARB + stage);
-        glBindTexture(bind_target, 0);
-        sCurrentBoundTextures[stage] = 0;
+        // LLGLSLShader can return -1
+        if (stage >= 0)
+        {
+                glActiveTextureARB(GL_TEXTURE0_ARB + stage);
+                glClientActiveTextureARB(GL_TEXTURE0_ARB + stage);
+                glBindTexture(bind_target, 0);
+                sCurrentBoundTextures[stage] = 0;
+        }
 }
 
 // static (duplicated for speed and to avoid GL_TEXTURE_2D default argument which requires GL header dependency)
 void LLImageGL::unbindTexture(S32 stage)
 {
-        glActiveTextureARB(GL_TEXTURE0_ARB + stage);
-        glClientActiveTextureARB(GL_TEXTURE0_ARB + stage);
-        glBindTexture(GL_TEXTURE_2D, 0);
-        sCurrentBoundTextures[stage] = 0;
+        // LLGLSLShader can return -1
+        if (stage >= 0)
+        {
+                glActiveTextureARB(GL_TEXTURE0_ARB + stage);
+                glClientActiveTextureARB(GL_TEXTURE0_ARB + stage);
+                glBindTexture(GL_TEXTURE_2D, 0);
+                sCurrentBoundTextures[stage] = 0;
+        }
 }
 
 // static