diff options
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/llrender/llfontgl.cpp | 20 | ||||
| -rw-r--r-- | indra/llrender/llfontgl.h | 1 | ||||
| -rw-r--r-- | indra/llwindow/llwindow.cpp | 6 | ||||
| -rwxr-xr-x | indra/newview/linux_tools/wrapper.sh | 4 |
5 files changed, 23 insertions, 9 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt index f6dfb063a9..af759e5bcb 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -39,6 +39,7 @@ Alissa Sabre VWR-2116 VWR-2826 VWR-3290 + VWR-3857 VWR-4010 VWR-3410 VWR-6386 diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp index c58517d167..4a3a64f955 100644 --- a/indra/llrender/llfontgl.cpp +++ b/indra/llrender/llfontgl.cpp @@ -56,6 +56,7 @@ LLFontGL* LLFontGL::sSansSerif = NULL; LLFontGL* LLFontGL::sSansSerifBig = NULL; LLFontGL* LLFontGL::sSansSerifHuge = NULL; LLFontGL* LLFontGL::sSansSerifBold = NULL; +LLFontList* LLFontGL::sMonospaceFallback = NULL; LLFontList* LLFontGL::sSSFallback = NULL; LLFontList* LLFontGL::sSSSmallFallback = NULL; LLFontList* LLFontGL::sSSBigFallback = NULL; @@ -306,7 +307,21 @@ BOOL LLFontGL::initDefaultFonts(F32 screen_dpi, F32 x_scale, F32 y_scale, sMonospace->reset(); } - failed |= !loadFace(sMonospace, monospace_file, monospace_size, NULL); + if (sMonospaceFallback) + { + delete sMonospaceFallback; + } + sMonospaceFallback = new LLFontList(); + if (!loadFaceFallback( + sMonospaceFallback, + sanserif_fallback_file, + monospace_size * ss_fallback_scale)) + { + delete sMonospaceFallback; + sMonospaceFallback = NULL; + } + + failed |= !loadFace(sMonospace, monospace_file, monospace_size, sMonospaceFallback); // // Sans-serif fonts @@ -466,6 +481,9 @@ void LLFontGL::destroyDefaultFonts() delete sSansSerifBold; sSansSerifBold = NULL; + delete sMonospaceFallback; + sMonospaceFallback = NULL; + delete sSSHugeFallback; sSSHugeFallback = NULL; diff --git a/indra/llrender/llfontgl.h b/indra/llrender/llfontgl.h index 196d063840..e49a9fc296 100644 --- a/indra/llrender/llfontgl.h +++ b/indra/llrender/llfontgl.h @@ -228,6 +228,7 @@ public: static LLString sAppDir; // For loading fonts static LLFontGL* sMonospace; // medium + static LLFontList* sMonospaceFallback; static LLFontGL* sSansSerifSmall; // small static LLFontList* sSSSmallFallback; diff --git a/indra/llwindow/llwindow.cpp b/indra/llwindow/llwindow.cpp index fd850fe258..1c1e1b6f2b 100644 --- a/indra/llwindow/llwindow.cpp +++ b/indra/llwindow/llwindow.cpp @@ -40,8 +40,6 @@ #include "llwindowwin32.h" #elif LL_DARWIN #include "llwindowmacosx.h" -#elif LL_LINUX -#include "llwindowlinux.h" // currently just a dummy wrapper #endif #include "llerror.h" @@ -464,10 +462,6 @@ LLWindow* LLWindowManager::createWindow( new_window = new LLWindowMacOSX( title, name, x, y, width, height, flags, fullscreen, clearBg, disable_vsync, use_gl, ignore_pixel_depth, fsaa_samples); -#elif LL_LINUX - new_window = new LLWindowLinux( - title, name, x, y, width, height, flags, - fullscreen, clearBg, disable_vsync, use_gl, ignore_pixel_depth); #endif } else diff --git a/indra/newview/linux_tools/wrapper.sh b/indra/newview/linux_tools/wrapper.sh index 1b7d6b809e..eaa2f61dce 100755 --- a/indra/newview/linux_tools/wrapper.sh +++ b/indra/newview/linux_tools/wrapper.sh @@ -43,7 +43,7 @@ ## in the bin directory will be stripped: you should replace it with ## an unstripped binary before you run. #export LL_WRAPPER='gdb --args' -#export LL_WRAPPER='valgrind --smc-check=all --log-file=secondlife.vg --leak-check=full --suppressions=/usr/lib/valgrind/glibc-2.5.supp --suppressions=secondlife-i686.supp' +#export LL_WRAPPER='valgrind --smc-check=all --error-limit=no --log-file=secondlife.vg --leak-check=full --suppressions=/usr/lib/valgrind/glibc-2.5.supp --suppressions=secondlife-i686.supp' ## - Avoids an often-buggy X feature that doesn't really benefit us anyway. export SDL_VIDEO_X11_DGAMOUSE=0 @@ -104,7 +104,7 @@ if [ -n "$LL_RUN_ERR" ]; then if [ "$LL_RUN_ERR" = "runerr" ]; then # generic error running the binary echo '*** Unclean shutdown. ***' - if [ "`arch`" = "x86_64" ]; then + if [ "`uname -m`" = "x86_64" ]; then echo cat << EOFMARKER You are running the Second Life Viewer on a x86_64 platform. The |