diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-03-26 11:32:31 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-03-26 11:32:31 -0400 |
| commit | e917620069ce20c30c1abb53c5ece847ee76ddba (patch) | |
| tree | 31e85be6bd0b0177ab56ae8dfeef1dfff15d19c5 /indra/llrender | |
| parent | 70ae613209bdc03f7ff45075e673e225447ec7a5 (diff) | |
| parent | ef544a22218d59c6a121d4bf88c49868a2b9a713 (diff) | |
merge changes for 3.5.0-beta5
Diffstat (limited to 'indra/llrender')
| -rw-r--r-- | indra/llrender/llfontgl.cpp | 5 | ||||
| -rw-r--r-- | indra/llrender/llgl.cpp | 9 |
2 files changed, 6 insertions, 8 deletions
diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp index 647512eb2e..8772779645 100644 --- a/indra/llrender/llfontgl.cpp +++ b/indra/llrender/llfontgl.cpp @@ -599,6 +599,11 @@ S32 LLFontGL::maxDrawableChars(const llwchar* wchars, F32 max_pixels, S32 max_ch if(!fgi) { fgi = mFontFreetype->getGlyphInfo(wch); + + if (NULL == fgi) + { + return 0; + } } // account for glyphs that run beyond the starting point for the next glyphs diff --git a/indra/llrender/llgl.cpp b/indra/llrender/llgl.cpp index 9e4857b6bc..c8cf3713ab 100644 --- a/indra/llrender/llgl.cpp +++ b/indra/llrender/llgl.cpp @@ -597,11 +597,6 @@ bool LLGLManager::initGL() if (mGLVendor.substr(0,4) == "ATI ") { mGLVendorShort = "ATI"; - BOOL mobile = FALSE; - if (mGLRenderer.find("MOBILITY") != std::string::npos) - { - mobile = TRUE; - } mIsATI = TRUE; #if LL_WINDOWS && !LL_MESA_HEADLESS @@ -1489,9 +1484,7 @@ void assert_glerror() void clear_glerror() { - // Create or update texture to be used with this data - GLenum error; - error = glGetError(); + glGetError(); } /////////////////////////////////////////////////////////////// |