diff options
| -rwxr-xr-x | .hgtags | 1 | ||||
| -rw-r--r-- | autobuild.xml | 24 | ||||
| -rw-r--r-- | indra/llwindow/llwindowsdl.cpp | 3 |
3 files changed, 27 insertions, 1 deletions
@@ -368,3 +368,4 @@ f4481df42f9a4a92bf475a80f0c51d1a4bbdfd59 DRTVWR-246 39c5204b6e800983a41ccac8ad6dc993120197c6 DRTVWR-247 7c7d57d393e8ae7b61623279de06eb4a62ccae6a DRTVWR-249 f72b50ef168c159d6e79e97aa2bcafaf8577ab99 DRTVWR-230 +b418be80903520c492e1173f3afbc4021cad5d07 DRTVWR-255 diff --git a/autobuild.xml b/autobuild.xml index f5ea967b32..82344ebc90 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -1453,6 +1453,30 @@ </map> </map> </map> + <key>mesa</key> + <map> + <key>license</key> + <string>mesa</string> + <key>license_file</key> + <string>LICENSES/mesa.txt</string> + <key>name</key> + <string>mesa</string> + <key>platforms</key> + <map> + <key>linux</key> + <map> + <key>archive</key> + <map> + <key>hash</key> + <string>1f600840463c7327ea17486821425750</string> + <key>url</key> + <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/mesa-7.0-linux-20100930.tar.bz2</string> + </map> + <key>name</key> + <string>linux</string> + </map> + </map> + </map> <key>ndofdev</key> <map> <key>license</key> diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp index c7b141d7c1..9ea76df479 100644 --- a/indra/llwindow/llwindowsdl.cpp +++ b/indra/llwindow/llwindowsdl.cpp @@ -2645,8 +2645,9 @@ std::vector<std::string> LLWindowSDL::getDynamicFallbackFontList() if (sortpat) { // Sort the list of system fonts from most-to-least-desirable. + FcResult result; fs = FcFontSort(NULL, sortpat, elide_unicode_coverage, - NULL, NULL); + NULL, &result); FcPatternDestroy(sortpat); } |