summaryrefslogtreecommitdiff
path: root/indra/llrender/llfontgl.cpp
AgeCommit message (Collapse)Author
2012-11-28SH-3563. Pull and merge from viewer-development. Modest code changes to fix ↵prep
alignment issue in llAppearance.
2012-11-19merge with viewer-developmentRichard Linden
2012-11-14SH-3406 WIP convert fast timers to lltrace systemRichard Linden
cleaning up build moved most includes of windows.h to llwin32headers.h to disable min/max macros, etc streamlined Time class and consolidated functionality in BlockTimer class llfasttimer is no longer included via llstring.h, so had to add it manually in several places
2012-10-11Updating linux build to gcc4.6Don Kjer
2012-10-10Introduce new LLDir::findSkinnedFilenames() method. Use as needed.Nat Goodspeed
In a number of different places, for different reasons, the viewer wants to load a UI-related file that might be overridden by a non-default skin; and within that skin, might further be overridden by a non-default language. Apparently, for each of those use cases, every individual developer approached it as an entirely new problem, solving it idiosyncratically for that one case. Not only is this a maintenance problem, but it rubs one's nose in the fact that most such solutions consider only a subset of the relevant skin directories. Richard and I evolved an API intended to address all such cases: a central LLDir method returning a list of relevant pathnames, from most general to most localized, filtered to present only existing files; plus a couple of convenience methods to specifically obtain the most general and most localized available file. There were several load-skinned-file methods (LLFloater::buildFromFile(), LLPanel::buildFromFile() and LLUICtrlFactory::createFromFile() -- apparently cloned-and-modified from each other) that contained funky bolted-on logic to output the loaded data to an optional passed LLXMLNodePtr param. The trouble is that passing that param forced each of these methods to subvert its normal search: specifically for that case, it needed to find the baseline XML file instead of the localized one. Richard agreed that for the intended usage (reformatting XML files) we should use XML schema instead, and that the hacky functionality should be removed. Remove it. Also remove LLUICtrlFactory::getLocalizedXMLNode(), only used for those three special cases. Some callers explicitly passed the optional LLXMLNodePtr param as NULL. Remove that. Remove LLFloaterUIPreview::displayFloater(save) param, which relied on the optional output LLXMLNodePtr param. Make onClickSaveFloater() and onClickSaveAll() emit popupAndPrintWarning() about discontinued functionality. Recast LLFloater::buildFromFile(), LLPanel::buildFromFile(), LLUICtrlFactory::createFromFile(), LLNotifications::loadTemplates(), LLUI::locateSkin(), LLFontRegistry::parseFontInfo(), LLUIColorTable::loadFromSettings(), LLUICtrlFactory::loadWidgetTemplate(), LLUICtrlFactory::getLayeredXMLNode(), LLUIImageList::initFromFile(), LLAppViewer::launchUpdater() and LLMediaCtrl::navigateToLocalPage() to use findSkinnedFilenames(). (Is LLAppViewer::launchUpdater() ever called any more? Apparently so -- though the linux-updater.bin logic to process the relevant command-line switch has been disabled. Shrug.) (Is LLMediaCtrl::navigateToLocalPage() ever used?? If so, why?) Remove LLUI::setupPaths(), getXUIPaths(), getSkinPath() and getLocalizedSkinPath(). Remove the skins/paths.xml file read by setupPaths(). The only configuration it contained was the pair of partial paths "xui/en" and "xui/[LANGUAGE]" -- hardly likely to change. getSkinPath() specifically returned the first of these, while getLocalizedSkinPath() specifically returned the second. This knowledge is now embedded in findSkinnedFilenames(). Also remove paths.xml from viewer_manifest.py. Remove injected xui_paths from LLFontGL::initClass() and LLFontRegistry::LLFontRegistry(). These are no longer needed since LLFontRegistry can now directly consult LLDir for its path search. Stop passing LLUI::getXUIPaths() to LLFontGL::initClass() in LLViewerWindow's constructor and initFonts() method. Add LLDir::append() and add() methods for the simple task of combining two path components separated by getDirDelimiter() -- but only if they're both non-empty. Amazing how often that logic is replicated. Replace some existing concatenations with add() or append(). New LLDir::findSkinnedFilenames() method must know current language. Allow injecting current language by adding an LLDir::setSkinFolder(language) param, and pass it where LLAppViewer::init() and initConfiguration() currently call setSkinFolder(). Also add LLDir::getSkinFolder() and getLanguage() methods. Change LLFLoaterUIPreview's LLLocalizationResetForcer helper to "forcibly reset language" using LLDir::setSkinFolder() instead of LLUI::setupPaths(). Update LLDir stubs in lldir_stub.cpp and llupdaterservice_test.cpp. Add LLDir::getUserDefaultSkinDir() to obtain often-overlooked possible skin directory -- like getUserSkinDir() but with "default" in place of the current skin name as the last path component. (However, we hope findSkinnedFilenames() obviates most explicit use of such individual skin directory pathnames.) Add LLDir unit tests for new findSkinnedFilenames() and add() methods -- the latter exercises append() as well. Tweak indra/integration_tests/llui_libtest/llui_libtest.cpp for all the above. Notably, comment out its export_test_floaters() function, since the essential LLFloater::buildFromFile(optional LLXMLNodePtr) functionality has been removed. This may mean that llui_libtest.cpp has little remaining value, not sure.
2012-05-15STORM-276 FIXED Squiggles overflow line editor height when font size is set ↵Kitty Barnett
to large - Also reduced squiggle width from 6 to 4 and prevented running past the end of a word
2012-02-07EXP-1181 WIP as a designer I would like to specify default floater positions ↵Richard Linden
using realtive coordinates refactored LLCoord code to be templated, ultimately to support arbitrary conversions
2012-02-03EXP-1513 FIX Underscore ( _ ) fails to show in first chat entry in Local ChatRichard Linden
EXP-1854 FIX Text positioning in mini inspector a couple pixels too low
2012-02-01converted a bunch of narrowing implicit conversions to explicitRichard Linden
2012-01-31EXP-1513 FIX Underscore ( _ ) fails to show in first chat entry in Local ChatRichard Linden
2012-01-27EXP-1513 FIX Underscore ( _ ) fails to show in first chat entry in Local ChatRichard Linden
2012-01-26EXP-1846 FIX Text positioning issues in Floaters, Notifications, UI, and ↵Richard Linden
toasts with UI size smaller than 1 also, re-enabled floater_test_textbox.xml
2012-01-18EXP-1513 FIX Underscore ( _ ) fails to show in first chat entry in Local ChatRichard Linden
fixed font metrics rounding error and made corrective adjustments in layout
2011-12-15storm-1723: fix character display when a lot of different characters are usedAlissa Sabre
2011-07-21merged VWR-25588 fix (hovertext occlusion)Boroondas Gupte
2011-07-21FIRE-543/VWR-25588: made in-code comment a bit clearerBoroondas Gupte
2011-07-21Credit Zi: FIRE-543 change fixes SH-489 and VWR-24017 and therefore also ↵Boroondas Gupte
VWR-25588 It looks like the parent changeset (86eec7b46566; transplanted from http://hg.phoenixviewer.com/phoenix-firestorm-lgpl/rev/7af0278beaef) fixes the following issues: * SH-489 (object hover text not occluded) * VWR-24017 (nametag / bubblechat not occluded) * VWR-25588 (union of the above two symptopms) Thus list them all under Zi's entry in doc/contributions.txt. Also removed her name from the in-code comment, to adhere to our CS.
2011-07-17Proposed fix for FIRE-543 - Hovertext renders as overlay on top of ↵ziree
everything else (transplanted from 7af0278beaefa4fb1eb9a41f4e9317ac5fe37690)
2011-05-25Automated merge with http://hg.secondlife.com/viewer-developmentRichard Linden
2011-05-25EXP-829 FIX Text Box Alignment bugRichard Linden
EXP-755 FIX [PUBLIC] 'Search' and 'World Map' links in Sidebar are unclickable fixed issues with UI scaling and text layout as well as incorrect text editor rect transforms reviewed by Callum
2010-10-13correct licenses (fix problem with license change merge)Oz Linden
2010-09-27mergeDave Parks
2010-09-21Fix for build failures - disabling tcmalloc for nowBrad Payne (Vir Linden)
2010-08-27Post-convert merge by convert_monolith.py from ./viewer-experienceMonroe Linden
2010-08-26mergeRichard Linden
2010-08-25mergeDave Parks
2010-08-19EXT-8525 FIX ellipsis are broken on the Favorites bar (trunk)Richard Linden
2010-08-19EXT-8525 FIX ellipsis are broken on the Favorites bar (trunk)Richard Linden
2010-08-24Backed out changeset c3d41f18ce2bTofu Linden
back-out the back-out for this branch. yay.
2010-08-24Backed out changeset a62bf7c0af21Tofu Linden
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24merge heads. whew.Tofu Linden
2010-08-13Change license from GPL to LGPL (version 2.1)Oz Linden
2010-08-04optimized font lookupsRichard Nelson
2010-07-30further UI rendering performance improvementsRichard Nelson
2010-07-30further UI rendering performance improvementsRichard Nelson
2010-07-29mergeRichard Linden
2010-07-29mergeRichard Linden
2010-07-29fix for truncated text renderingRichard Linden
2010-07-29fix for truncated text renderingRichard Linden
2010-07-28fix an implicit downcast in font code.Tofu Linden
2010-07-28fix an implicit downcast in font code.Tofu Linden
2010-07-23first pass ui rendering performance improvementsRichard Linden
2010-07-23first pass ui rendering performance improvementsRichard Linden
2010-07-14mergeDave Parks
2010-07-01missed some cases in font valign switchRichard Linden
2010-07-01EXT-7654 - About Land Floater> Icons missingRichard Linden
fixed layout of embedded icons in text labels
2010-03-24viewer2 mergeTofu Linden
2010-03-23EXT-5549 Can't select last character in chat windowRichard Nelson
2010-02-19fix warning introduced from trunk merge.Tofu Linden
2010-02-19merge from viewer2, conflicts resolved...Tofu Linden