Age | Commit message (Collapse) | Author | |
---|---|---|---|
2012-10-10 | Introduce 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-10-04 | merge changes for DRTVWR-222 | Oz Linden | |
2012-10-04 | Merge from Nat's repo - SWAT-711: Create Mac app bundle symlinks only for ↵ | Jeff (Gioffredo Linden) | |
.dylib files that exist. Previous viewer_manifest.py unconditionally created Mac symlinks for all expected .dylib files. Recent change to revert to statically linking llcommon means we no longer build libllcommon.dylib, therefore we no longer copy it, therefore any symlink to that library will be broken by definition. Change to create symlinks for .dylib files that were successfully copied. | |||
2012-10-02 | Adding libtcmalloc to the linux installer package. | William Todd Stinson | |
2012-10-01 | Only enable breakpad error handing if crash reporting is enabled | Dave Parks | |
2012-09-27 | Yet another attempt at deleting tcmalloc | Dave Parks | |
2012-09-27 | Another attempt at deleting tcmalloc_minimal.dll | Dave Parks | |
2012-09-27 | Modify installer to remove libtcmalloc_minimal.dll | Dave Parks | |
2012-09-20 | Pull and merge from ↵ | William Todd Stinson | |
ssh://hg@bitbucket.org/stinson_linden/viewer-beta-drtvwr-179. | |||
2012-09-18 | SWAT-711: Create Mac app bundle symlinks only for .dylib files that exist. | Nat Goodspeed | |
Previous viewer_manifest.py unconditionally created Mac symlinks for all expected .dylib files. Recent change to revert to statically linking llcommon means we no longer build libllcommon.dylib, therefore we no longer copy it, therefore any symlink to that library will be broken by definition. Change to create symlinks for .dylib files that were successfully copied. | |||
2012-09-12 | initial attempt to restore changes that make removing tcmalloc possible; not ↵ | Oz Linden | |
tested | |||
2012-09-10 | Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the ↵ | William Todd Stinson | |
repository. | |||
2012-09-07 | DRTVWR-209 Merge of viewer-development with SH-3316 drano-http code. | Monty Brandenberg | |
This was yet another refresh from v-d because of significant changes to lltexturefetch that would not have been resolvable by casual application of any merge tool. There are still a few questions outstanding but this is the initial, optimistic merge. | |||
2012-08-22 | Fix up white space to follow coding policy guidelines | callum_linden | |
2012-08-16 | Silly Python 'string' fix | callumprentice | |
2012-08-16 | Silly Python 'string' fix | callumprentice | |
2012-08-16 | Silly typo fix | callumprentice | |
2012-08-15 | Add explicit reference to keychain to use | callumprentice | |
2012-08-15 | silly typo - change language from dutch to english :) | callumprentice | |
2012-08-15 | Changed name of keychain to match setup instructions | callum_linden | |
2012-08-08 | Pulled merge, changed . to , in viewer-manifest | Aura Linden | |
2012-08-07 | Read password for developer keychain from build-secrets repo and use it to ↵ | callum_linden | |
unlock keychain. Only unlock and code sign if running under Team City. | |||
2012-08-03 | Merge of viewer-development (3.4.1). | Monty Brandenberg | |
2012-07-25 | Fix to build with code signing option (patch from STORM-1900) | callum_linden | |
2012-07-25 | SH-3304 drano-http viewer fails to launch on linux | Monty Brandenberg | |
libapr-1.so.0.4.5 and libaprutil-1.so.0.4.1 missing from manifest. | |||
2012-07-11 | Pull in viewer-development because it's painful. Merge with runitai's help. | simon@Simon-PC.lindenlab.com | |
2012-07-02 | Merge 3.3.3 release with Drano HTTP library at 3.3.0 | Monty Brandenberg | |
Big delta was converting the new texture debugger support code to the new library. Viewer manifest should probably get an eyeball before release. | |||
2012-06-27 | merge changes for DRTVWR-167 | Oz Linden | |
2012-06-25 | correct linux packaging for hunspell library | Oz Linden | |
2012-06-22 | merge | Brad Payne (Vir Linden) | |
2012-06-22 | merge | Dave Parks | |
2012-06-21 | merge changes for DRTVWR-168 | Oz Linden | |
2012-06-04 | merge | Brad Payne (Vir Linden) | |
2012-05-09 | Automated merge with http://hg.secondlife.com/viewer-release | Nat Goodspeed | |
2012-05-09 | Add more boost libs to the lib copy and manifest. | Monty Brandenberg | |
2012-05-08 | And more boost library work. | Monty Brandenberg | |
2012-05-08 | merge changes for version 3.3.1 | Oz Linden | |
2012-05-08 | Now trying to get linux working. libllcommon is picking up .so | Monty Brandenberg | |
boost libraries when we tend to want statics. Try to work around that for the moment. | |||
2012-04-23 | go back to the more elaborate way to find dictionaries (the way that works) | Oz Linden | |
2012-04-23 | correct mac hunspell lib name, try simpler reference to dictionaries | Oz Linden | |
2012-04-23 | remove debugging prints around packaging the dictionaries | Oz Linden | |
2012-04-19 | grumble relative grumble python grumble | Oz Linden | |
2012-04-19 | reference packages relative to newview | Oz Linden | |
2012-04-19 | use build directory argument directly | Oz Linden | |
2012-04-19 | try forcing use of build prefix to copy dictionaries | Oz Linden | |
2012-04-19 | missing paren in dictionary copying | Oz Linden | |
2012-04-18 | rearrange dictionary copying | Oz Linden | |
2012-04-18 | fix logging to diagnose path problem | Oz Linden | |
2012-04-18 | add logging to diagnose path problem | Oz Linden | |
2012-04-13 | yet another path for the dictionaries package... | Oz Linden | |