summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2017-08-24merge up latest integration repoOz Linden
2017-08-23merge changes for MAINT-7594Oz Linden
2017-08-22Automated merge with ssh://bitbucket.org/lindenlab/viewer64Nat Goodspeed
2017-08-22MAINT-7594: add platform name string to login request (and add request ↵Oz Linden
parameter logging at DEBUG)
2017-08-17MAINT-7661: Make NSIS installer place .winstall marker file.Nat Goodspeed
This reduces a timing hole in which one instance of SL_Launcher might place a .winstall marker file in the download directory and run the downloaded installer, but another SL_Launcher instance might discover that marker and try to delete the directory before the NSIS install completes.
2017-08-16merge changes for DRTVWR-439Oz Linden
2017-08-15Merged in lindenlab/viewer64-maint-7643 (pull request #17)Oz Linden
MAINT-7643 Approved-by: Oz Linden <oz@lindenlab.com> Approved-by: Nat Linden <nat@lindenlab.com>
2017-08-15Merged in rider_linden/viewer64-gundam (pull request #18)Oz Linden
Default
2017-08-14fix indentingOz Linden
2017-08-14MAINT-7640: code review fixesOz Linden
2017-08-14MAINT-7640: Notify the user if login is blocked for a required viewer updateOz Linden
2017-08-11MAINT-7641: Indent new RunLauncher notification per code review.Nat Goodspeed
2017-08-11MAINT-7641: Warn user if s/he directly runs viewer without launcher.Nat Goodspeed
2017-08-08Added comment block to code signing portion of viewer-manifest.py describing ↵callum_linden
potential gotchas in the future and how to obviate them
2017-08-03MAINT-7653 Crash in LLVOAvatarSelf::updateAvatarRezMetrics(bool)Mnikolenko ProductEngine
2017-07-28MAINT-7634: Move StatsAccumulator into llcommon, collect data sent and error ↵Rider Linden
codes from core.
2017-07-28MAINT-7356 Improved multiline label support for the notification toast checkboxAndreyL ProductEngine
2017-07-28Merged in maxim_productengine/viewer-lynx_maint (pull request #63)Andrey Lihatskiy
MAINT-7650 FIXED Crash in LLPreviewLSL::saveIfNeeded(bool) Approved-by: Andrey Kleshchev <andreykproductengine@lindenlab.com> Approved-by: Andrey Lihatskiy <andreylproductengine@lindenlab.com>
2017-07-28MAINT-7650 FIXED Crash in LLPreviewLSL::saveIfNeeded(bool)Mnikolenko Productengine
2017-07-28MAINT-7632 Crash in LLMeshRepoThread::fetchMeshLOD() - added allocation checkAndreyL ProductEngine
2017-07-27Fix return value so that LLSD assignment operator is unambiguousGlenn Glazer
2017-07-27MAINT-7643: add viewer bitness to crash log output, forked from V64Glenn Glazer
2017-07-27revert bad file copyGlenn Glazer
2017-07-27MAINT-7643: add viewer bitness to crash log outputGlenn Glazer
2017-07-25MAINT-7636 Crash in LLPanelClassifiedInfo::sendClickMessage(..)Mnikolenko ProductEngine
2017-07-24MAINT-7629 FIXED Crash in LLSpeakerMgr::findSpeaker(LLUUID const &)Mnikolenko ProductEngine
2017-07-20MAINT-7529: de-Nerf autolaunch after installGlenn Glazer
2017-07-19merge new CEF, MAINT-7588, and better fix for MAINT-7592Oz Linden
2017-07-19merge from viewer64-vmp-integrationGlenn Glazer
2017-07-18do not persist SkipBenchmark so that changing gpu gets a new evalOz Linden
2017-07-13add SkipBenchmark settingOz Linden
2017-07-12Fixes for: 'MAINT-7588 Viewer takes 3 to 5 seconds to load TOS and styling ↵Callum Prentice
different on redirecting page' and 'MAINT-7599 Reformat ToS 'Accept' label as a single string'. The former's load time is improved by only asking for the HTTP header to check site is alive and then applying a specific CSS style to the page instead of relying on the CEF default (which appears to change often). The latter replaces the XUI checkbox label with a text box and adjusts it visually as necessary for enabled/disabled states
2017-07-12add logging for skipping benchmark (and fixed some log tags)Oz Linden
2017-07-11merge changes for MAINT-7592Oz Linden
2017-07-11MAINT-7592 (update): fix ToS cancel alert and leftover xml comment terminatorOz Linden
2017-07-11merge latest VMP updatesOz Linden
2017-07-11merge changes for MAINT-7592Oz Linden
2017-07-11merge changes for MAINT-7592Oz Linden
2017-07-11merge floater TOS changeGlenn Glazer
2017-07-11MAINT-7592: Update ToS agreement floaterOz Linden
2017-07-11MAINT-7581 [contribution] Closing the 'Replace links' floater crashes the ↵Mnikolenko Productengine
viewer if a replace is in progress
2017-07-25MAINT-7356 Improved the notification appearanceAndreyL ProductEngine
2017-07-21MAINT-7356 Logic fix and cleanupAndreyL ProductEngine
2017-07-18MAINT-7607 FIXED Viewer crashes when double clicking on scroll bar arrow in ↵Mnikolenko Productengine
Outfit Gallery tab
2017-07-12Merged in oz_linden/maint-7592AndreyL ProductEngine
2017-07-11Merged in oz_linden/maint-7592AndreyL ProductEngine
2017-07-10MAINT-4532: properly detect Windows 10 in the 64bit build (only - 32bit runs ↵Oz Linden
in Windows 8 compatibility mode)
2017-07-10Remove FAS from cmd_line.xmlGlenn Glazer
2017-07-07mergeGlenn Glazer
2017-07-07MAINT-7571: detect if all HD cards are bad and addr is forced to 64, then ↵Glenn Glazer
stay at 64 bit