summaryrefslogtreecommitdiff
path: root/indra/integration_tests
AgeCommit message (Collapse)Author
2022-10-01SL-16542 Pull in chunks of graham's openjpeg code, update openjpeg and ↵Andrey Kleshchev
enable partial bitstreams Openjpeg was modified: "p_max_len -= l_nb_bytes_read;" was causing an overflow. I'm not sure if I did something incorectly in opj_skip/opj_seek viewer side, but seems like openjpeg should have been checking remaining space in p_max_len either way. P.S. Many thanks to Chafey and Neopallium for implementing openjpeg's partial bitstream support
2021-03-09This set of changes reverts the merge with master (git revert c83e740) and ↵Callum Prentice
results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal
2021-03-08Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into ↵Brad Payne (Vir Linden)
DRTVWR-519" This reverts commit e61f485a04dc8c8ac6bcf6a24848359092884d14, reversing changes made to 00c47d079f7e958e473ed4083a7f7691fa02dcd5.
2020-09-17Some small changes to replace 'vfs' with 'filesystem' outside of my dev envCallum Prentice
2020-03-25[DRTVWR-476] - fix linkingAnchor
2018-09-07remove only-partially-successful attempt to put teamcity blocks around targetsOz Linden
2018-09-05add more block structure to TeamCity log output for componentsOz Linden
2017-02-03Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2016-12-10DRTVWR-418: Update some copy commands for 3p library versions.Nat Goodspeed
2016-12-08DRTVWR-418: Change Mac build_directory to build-darwin-x86_64Nat Goodspeed
since we no longer support 32-bit Mac builds. The old build-darwin-i386 directory name appeared in a shocking number of files. Change CMake paths to use ${CMAKE_BINARY_DIR} -- or, when trying to find the packages subdirectory, ${AUTOBUILD_INSTALL_DIR}. Change the rest to at least look for build-darwin-*.
2016-08-30Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2015-11-10remove execute permission from many files that should not have itOz Linden
2015-05-20MAINT-5232: Introduce SUBSYSTEM_CLEANUP() macroNat Goodspeed
and use it for existing LLSomeClass::cleanupClass() calls. This logs the fact of making the call, as well as making it.
2014-05-06Pull merge from lindenlab/viewer-release. Fixed some conflicts and compile ↵Merov Linden
errors
2014-02-13Pull merge from lindenlab/viewer-acmeMerov Linden
2014-02-13ACME-1277 : Final set of filters, added a SnapshotFiltersEnabled debug settingMerov Linden
2014-02-13Updated test filtersCho
2014-02-12ACME-1277 : Add new example filter scriptsMerov Linden
2014-02-06ACME-1277 : Add a set of creative filters to the llimage_libtest/filters ↵Merov Linden
examples
2014-02-06ACME-1301 : Add colortransform as a secondary filter commandMerov Linden
2014-02-06ACME-1301 : Add convolve as a secondary filter commandMerov Linden
2014-01-21ACME-1236 : Make all filters resolution independent, cleanup comments, move ↵Merov Linden
example filters to a sub folder in llimage_libtest
2014-01-21ACME-1236 : Fixes gamma and brightness code. Also fixes example xml filter ↵Merov Linden
files.
2014-01-21ACME-1240 : Implement convolve filter for 3x3 kernels. Implements sharpen, ↵Merov Linden
blur and edge detection as examples and tests.
2014-01-16ACME-1236 : Small LLImageFilter clean upMerov Linden
2014-01-14ACME-1236 : Refactor filters and vignette into llimagefilter, add example ↵Merov Linden
filters to llimage_libtest
2014-01-13ACME-1244 : Introduced llimage/llimagefilter, refactored the filter ↵Merov Linden
execution code, simplified llimage_libtest filter testing
2014-01-09ACME-1236 : Add lines as a new type of vignette and Brightscan as an exampleMerov Linden
2014-01-08ACME-1236 : WIP : Added mode and angle parameter to filterScreen (renamed ↵Merov Linden
for consistency)
2014-01-07ACME-1236 : WIP : Introduced screenFilter, simple creative screening filterMerov Linden
2014-01-07ACME-1236 : WIP : Add filter file loading and execution to llimage_libtest, ↵Merov Linden
suppress the a la Instagram tests as a result
2014-01-06ACME-1236 : WIP : Make each color correct filter use a per channel alpha ↵Merov Linden
argument, tweak Instagram-like test filters for discussion
2014-01-03ACME-1236 : WIP : Add 2 new color correction filters. Add a la Instagram ↵Merov Linden
composite filters for testing in llimage_libtest
2014-01-03ACME-1236 : WIP : Added a min value to vignetteMerov Linden
2014-01-03ACME-1236 : WIP : Added the vignette mode. Can be applied to colorCorrect ↵Merov Linden
and color Transform. Added new -v argument to llimage_libtest
2014-01-02ACME-1236 : WIP : added all the color correction filters: colorize, ↵Merov Linden
linarize, equalize, contrast, brightness
2014-01-01ACME-1236 : WIP : add filterGamma, computeHistograms, colorCorrect, ↵Merov Linden
implemented filter gamma to llimage_libtest for testing
2014-01-01ACME-1236 : WIP : add filterRotate to rotate hue, add rotate as a valid ↵Merov Linden
argument to --filter in llimage_libtest
2014-01-01ACME-1236 : WIP : add an optional filter parameter to llimage_libtestMerov Linden
2013-12-30ACME-1236 : WIP : Implement saturation/desaturation transform filter, add it ↵Merov Linden
to llimage_libtest for testing
2013-12-20ACME-1236 : WIP : Implement colorTransform filter, grayscale and sepia using ↵Merov Linden
it, add parameter to llimage_libtest to use filters
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.