1 files changed, 7 insertions, 5 deletions

diff --git a/linden/indra/llrender/llfontgl.cpp b/linden/indra/llrender/llfontgl.cpp
index 2774e8d..2740c6c 100644
--- a/linden/indra/llrender/llfontgl.cpp
+++ b/linden/indra/llrender/llfontgl.cpp
@@ -33,6 +33,7 @@
 #include "llfontgl.h"
 #include "llgl.h"
 #include "v4color.h"
+#include "llstl.h"
 
 const S32 BOLD_OFFSET = 1;
 
@@ -155,7 +156,7 @@ LLString LLFontGL::getFontPathSystem()
         // Try to figure out where the system's font files are stored.
         char *system_root = NULL;
 #if LL_WINDOWS
-        system_root = getenv("SystemRoot");
+        system_root = getenv("SystemRoot");     /* Flawfinder: ignore */
         if (!system_root)
         {
                 llwarns << "SystemRoot not found, attempting to load fonts from default path." << llendl;
@@ -647,7 +648,7 @@ S32 LLFontGL::render(const LLWString &wstr,
         case LEFT:
                 break;
         case RIGHT:
-                cur_x -= (F32)getWidth(wstr.c_str(), 0, length) * sScaleX;
+                cur_x -= llmin(scaled_max_pixels, llround(getWidthF32(wstr.c_str(), 0, length) * sScaleX));
                 break;
         case HCENTER:
             cur_x -= llmin(scaled_max_pixels, llround(getWidthF32(wstr.c_str(), 0, length) * sScaleX)) / 2;
@@ -672,12 +673,13 @@ S32 LLFontGL::render(const LLWString &wstr,
 
 
         BOOL draw_ellipses = FALSE;
-        if (use_ellipses)
+        if (use_ellipses && halign == LEFT)
         {
                 // check for too long of a string
                 if (getWidthF32(wstr.c_str(), 0, max_chars) > scaled_max_pixels)
                 {
-                        const LLWString dots(utf8str_to_wstring(LLString("...")));
+                        // use four dots for ellipsis width to generate padding
+                        const LLWString dots(utf8str_to_wstring(LLString("....")));
                         scaled_max_pixels = llmax(0, scaled_max_pixels - llround(getWidthF32(dots.c_str())));
                         draw_ellipses = TRUE;
                 }
@@ -1330,7 +1332,7 @@ LLString LLFontGL::nameFromFont(const LLFontGL* fontp)
 {
         if (fontp == sSansSerifHuge)
         {
-                return LLString("SansSerifHude");
+                return LLString("SansSerifHuge");
         }
         else if (fontp == sSansSerifSmall)
         {