All submissions to this site are governed by the Second Life Viewer Contribution Agreement. By submitting patches and other information using this site, you acknowledge that you have read, understood, and agreed to those terms.

Review Board 1.6.11

Welcome to the Second Life Viewer Code Review tool.
See the documentation on our wiki for how to use this site.

Fix for STORM-1854.

Review Request #609 - Created Nov. 30, 2012 and updated

Log Linden Reviewers
ssh://hg@bitbucket.org/log_linden/viewer-storm-1854 viewer
STORM-1854
None viewer-development 
This is a fix for STORM-1854. It prevents an assert failure that happens during viewer startup on linux systems with a sufficiently new version of the fontconfig library (I think fontconfig 1.9). It should not impact mac or windows because those platforms do not use llwindowsdl.cpp file, which was the only file changed.
This change builds successfully on all three platforms (Teamcity). I have verified that the startup error no longer occurs on Ubuntu 12.10. Ideally we would test that Linux systems with older versions of fontconfig can also still start the viewer, but I don't have easy access to one of those.
Nicky Perian
Posted (Dec. 1, 2012, 9:30 a.m.)
Kokua's approach was to updated the libs and deliver them using viewer_manifest.py.
Using the updated libs/includes I get the following compiler error.
It appears when the libs are LL updated this mod will need to be backed out.

 ‘static std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > 
LLWindowSDL::getDynamicFallbackFontList()’:
/home/bill/kokua-dev-q/indra/llwindow/llwindowsdl.cpp:2651: error: cannot convert ‘FcResult’ to ‘FcResult*’ for argument ‘5’ to ‘FcFontSet* FcFontSort(FcConfig*, FcPattern*, FcBool, FcCharSet**, FcResult*)’

  1. Odd. To me, it looks like the new code would be passing a FcResult*, not a FcResult.
Ship it!
Tankmaster Finesmith
Posted (Dec. 1, 2012, 3:47 p.m.)
Ship It!
  1. the approach in this diff is the same NickyD used in firestorm.  WE haven't had issues with it so far
Nicky Perian
Posted (Dec. 1, 2012, 4 p.m.)
https://bitbucket.org/log_linden/viewer-storm-1854/commits/cf7ad502c7c3/ does not match this diff. result should be &result
  1. Got fixed in https://bitbucket.org/log_linden/viewer-storm-1854/commits/b418be80903520c492e1173f3afbc4021cad5d07
Ship it!
Nicky Perian
Posted (Dec. 1, 2012, 9 p.m.)
Compiled linux 32 and 64 bit with the updated freetype and fontconfig libraries. Ran fine on debain squeeze and ubuntu 12.10.
Ship it!
Boroondas Gupte
Posted (Dec. 2, 2012, 2:37 a.m.)
Ship It!