summaryrefslogtreecommitdiff
path: root/indra/newview/CMakeLists.txt
AgeCommit message (Collapse)Author
2017-04-21Automated merge with tip of viewer64 (after it was merged with viewer-release)Callum Prentice
2017-04-21Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2017-04-19Add back the missing pieces and updated code for the example plugin. It was ↵Callum Prentice
useful during testing SLPlugin changes. Not shipped with release versions of viewer
2017-03-15MAINT-7168 Avatar rendering settings adjustmentsMnikolenko Productengine
2017-02-15improve dependency declarations for packages-info and other settings filesOz Linden
2017-02-06MAINT-7104 Add Grid status floater and toolbar buttonMnikolenko ProductEngine
2017-02-03Automated merge with ssh://bitbucket.org/lindenlab/viewer64Nat Goodspeed
2017-02-03Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2017-01-27First batch of changes to add LibVLC media plugin to macOS viewer. Plugin ↵Callum Linden
fails to start because of an as-yet undiagnosed issue with VLC plugin files related to their extyended attributes
2016-12-22one more try... also fixing setting of viewer_channel without quotesOz Linden
2016-12-09move some cmake messages that are not warnings from stderr to stdoutOz Linden
2016-12-09add AUTOBUILD_ADDRSIZE to symbol file name for clarity, change output tag to ↵Oz Linden
just "Symbolfile"
2016-12-05Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2016-12-05Merged in lindenlab/viewer-releaseAndreyL ProductEngine
DRTVWR-412 Bento (avatar skeleton extensions)
2016-11-21Merged in Ansariel/storm-2141AndreyL ProductEngine
2016-11-14STORM-2141: Fix various inventory floater related issues:Ansariel
* Opening new inventory via Control-Shift-I shortcut uses legacy and potentinally dangerous code path * Closing new inventory windows don't release memory * During shutdown legacy and inoperable code for inventory window cleanup is called * Remove old and unused inventory legacy code
2016-11-03Automated merge with ssh://bitbucket.org/lindenlab/viewer-releaseNat Goodspeed
2016-10-18mergeBrad Payne (Vir Linden)
2016-10-11Merged in lindenlab/viewer-bearAndreyL ProductEngine
2016-09-27MAINT-6737 [VOB] Show confirmation floater when dnd an image to an Outfit folderMnikolenko Productengine
2016-09-20mergeBrad Payne (Vir Linden)
2016-09-16MergeRider Linden
2016-08-16Merge VOB with 4.0.8-releasepavelkproductengine
2016-08-15merge from viewer-releaseBrad Payne (Vir Linden)
2016-08-11merge changes for 4.0.7-releaseOz Linden
2016-06-02MAINT-5194 Visual Outfit browserpavelkproductengine
Made refactoring of LLFloaterOutfitSnapshot and LLFloaterSnapshot
2016-06-01Linux: Use media_plugin_libvlc for media playback.Nicky
2016-05-24Merge VOB with release 4.0.6pavelkproductengine
2016-05-25MAINT-6413 BuildfixAndreyL ProductEngine
2016-05-24merge from maint-6413 into lynx for pull requestGlenn Glazer
2016-05-24MAINT-6413: write summary.json from viewer_manifest.py, remove facility from ↵Glenn Glazer
cmake
2016-05-23Automated merge with tip of viewer-releasecallum_linden
2016-05-23debug version argsGlenn Glazer
2016-05-23backout 354346 / e63c00cf654a and 354347 / e4bfe3ee05a6Glenn Glazer
2016-05-23backout 354345Glenn Glazer
2016-05-21merged jelly-doll viewer-release into bentoBrad Payne (Vir Linden)
2016-05-19Automated merge with tip of viewer-release to pick up 4.0.5callum_linden
2016-05-17maint-6413: use configure_file instead of write(file ...)Glenn Glazer
2016-05-17maint-6413: use file write as printf inserts escape charsGlenn Glazer
2016-05-16fix for maint-6413: add channel to summary.jsonGlenn Glazer
2016-05-10Merged in oz_linden/maint-5974Mnikolenko Productengine
2016-05-06Moving to a private repocallum_linden
2016-05-06Merge with https://bitbucket.org/oz_linden/maint-5974 to pick up a variety ↵callum_linden
of fixes
2016-05-06mergeBrad Payne (Vir Linden)
2016-05-06merge 4.0.4-release and MAINT-5974Oz Linden
2016-05-06fix cmake warning by conditionalizing dependency that does not exist on MacsOz Linden
2016-05-02Fixed disabling of Windows error reportingAnsariel
2016-04-29MAINT-6226 Incorporate a customized Snapshot feature to Outfit Browser flowpavelkproductengine
Initial version, further refactoring pending
2016-04-21DRTVWR-418 remove vestiges of TCMALLOC and GooglePerfTools from the viewercallum_linden
2016-04-04merge with 4.0.3-releaseOz Linden