summaryrefslogtreecommitdiff
path: root/indra/integration_tests
AgeCommit message (Collapse)Author
2013-09-09merge with viewer-releaseRichard Linden
2013-08-14BUILDFIX: converted platform-specific files over to new LL_INFOS, etc macrosRichard Linden
2013-05-13Merged with https://bitbucket.org/lindenlab/viewer-betaGeenz
2013-04-19merge changes for DRTVWR-294Oz Linden
2013-03-29Update Mac and Windows breakpad builds to latestGraham Madarasz
2013-02-27Added missing IOKit lib dep to llui_libtest integration test cmakeGraham Madarasz (Graham Linden)
2012-11-28SH-3563. Pull and merge from viewer-development. Modest code changes to fix ↵prep
alignment issue in llAppearance.
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-06-21merge changes for DRTVWR-168Oz Linden
2012-05-24merge changes for DRTVWR-151Oz Linden
2012-04-13add cmake configuration for hunspell to llui integration testOz Linden
2012-03-15EXP-3049 : Implement partial loading using the calcDataSize(discard_level) ↵Merov Linden
computation found in the viewer.
2012-03-15SH-3047 : Add a load_size argument to llimage_libtest and allow partial ↵Merov Linden
image file to be loaded.
2012-03-15SH-3047 : Read the number of levels from the j2c image header instead of ↵Merov Linden
relying on hacked computation based on width / height.
2012-04-11add hunspell libraries in unit test buildOz Linden
2012-01-20removed LLXUIXML libraryRichard Linden
moved LLInitParam, and LLRegistry to llcommon moved LLUIColor, LLTrans, and LLXUIParser to llui reviewed by Nat
2011-10-06Linux build fix.Seth ProductEngine
2011-08-17convert tabs to spaces where they are forbiddenOz Linden
2011-08-02Fix build of llimage_libtestMerov Linden
2011-05-17Merge from viewer-development.Vadim ProductEngine
2011-05-13Automated merge with http://hg.secondlife.com/viewer-developmentRichard Linden
2011-05-13STORM-1202 FIXED Time spin controlPaul ProductEngine
Implemented time spin control which is like spin control, but shows and allows to edit time string in "hh:mm PM/AM" format. Implemented according to the WLRS spec.
2011-05-11STORM-477 Restored the backed out changeset: b62b260aa04dSeth ProductEngine
2011-05-04EXP-664 : Make encoding parameters more resilient to bad entries, add levels ↵Merov Linden
as encoding parameters, update test applet to support this
2011-04-15EXP-672, EXP-673 : Fix bug in encoding small textures (16x16 and under)Merov Linden
2011-04-13EXP-663 : Allow creation of j2c images with precincts and blocks, limited to ↵Merov Linden
llimage_libtest, no viewer change
2011-04-13EXP-669 : Refactor code to use correct LLImageFormatted methods to load ↵Merov Linden
images of all formats, reviewed by richard
2011-04-07STORM-746 : Clean up typos in commentsMerov Linden
2011-04-07STORM-746 : Fix bug in performance report outputMerov Linden
2011-04-04STORM-746 : add precincts and blocks arguments taken into account in j2c outputMerov Linden
2011-04-04STORM-746 : add new arguments for precincts and blocks on output, region and ↵Merov Linden
level on input, add code for input loading restriction
2011-03-30STORM-1121 : Suppress the debug cmake instructionMerov Linden
2011-03-30STORM-1121 : Simplify dependencies for llimage_libtestMerov Linden
2011-03-30STORM-987 : cmake fixes so that llimage_libtest builds correctly on Mac with ↵Merov Linden
autobuild
2011-03-29STORM-987: Make building of llimage_libtest optional so that builf failure ↵Merov Linden
on Linux doesn't block autobuild merge
2011-03-29Pull from lindenlab/viewer-developmentMerov Linden
2011-03-25STORM-987 : Fix the creation of images in local dirMerov Linden
2011-03-10STORM-987 : Took Vadim's comment into account: check arguments consistency, ↵Merov Linden
make sure remaining perf data are flushed on exit.
2011-03-09STORM-987 : Add the --image-stats argument, make argument passing more ↵Merov Linden
consistent, fix typos in comments in llimage header
2011-03-08STORM-987 : Add --logmetrics and --analyzeperformance arguments, moved ↵Merov Linden
analyzeMetricPerformanceLog() and doAnalysisMetrics() from LLFastTimerView to LLMetricPerformanceTesterBasic
2011-02-16STORM-987 : Allow more flexibility around input and output listsMerov Linden
2011-02-16STORM-987 : Implement in and out list of files and pattern matchingMerov Linden
2011-02-15STORM-987 : Add in and out command line arguments, builds and runs on ↵Merov Linden
Windows and Mac
2011-02-15STORM-987 : Clean-up very silly cmake issues prior to making Windows buildMerov Linden
2011-02-15STORM-987 : First pass, builds on Mac, no command line argument parsing yetMerov Linden
2011-02-09STORM-987 : Create initial files for llimage_libtest (doesn't build)Merov Linden
2011-01-18windows build fixes.Alain Linden
2010-12-21STORM-151 : pull in viewer-developmentMerov Linden
2010-12-20STORM-151 : Fix llui_libtest integration testMerov Linden