summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-08-11Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maintAndrey Lihatskiy
# Conflicts: # indra/cmake/DirectX.cmake # indra/newview/llviewerparcelmedia.cpp # indra/newview/viewer_manifest.py
2020-08-11SL-13626 Renamed PoolSizeAssetStorage to PoolSizeVAssetStorageAndrey Kleshchev
to reflect previous commit and use correct pool size
2020-08-10Merge branch 'master' into DRTVWR-501-maintAndrey Lihatskiy
2020-08-10Increment viewer version to 6.4.7Nat Goodspeed
following promotion of DRTVWR-476
2020-08-06Revert "SL-11215: Add release notes URLs to update-related notifications."Andrey Kleshchev
This reverts commit bf999f2f84dd26844c60d682f563f982a55e8ee8 due to revert of updater, this will be moved to separate 'epic' instead
2020-08-06SL-13737 Crash when cleaning up uninitialized ndof deviceAndrey Kleshchev
2020-08-05Revert commit bbb16ff97c1dbafa21358dbee8ca686d3c30478e.Andrey Kleshchev
This fails at teamcity due to missing LLTrans, but builds locally without issues. Reverting to not hold D501
2020-08-05Merged in euclid-13521 (pull request #228)Dave Houlton
SL-13521 Add avatar appearance lighting to deferred lighting path Approved-by: Andrey Kleshchev Approved-by: Michael Pohoreski
2020-08-05SL-13521, clang-format LLRender::syncLightState() (whitespace)Dave Houlton
2020-08-05SL-13521, stamp out some remaining hard-coded 8sDave Houlton
2020-08-05SL-13719 One more exit crash for asset storageAndrey Kleshchev
2020-08-05SL-13704 Move link generation into getReleaseNotes()Andrey Kleshchev
2020-08-05Merge branch 'DRTVWR-476' into DRTVWR-501-maintAndrey Lihatskiy
2020-08-04SL-13521, clang-format renderDeferredLighting() for consistencyDave Houlton
2020-08-04SL-13521 add an avatar appearance light to deferred modeDave Houlton
2020-08-03Updated LLCA to codeticket build 546021Andrey Lihatskiy
2020-07-31SL-13626 Fixed spelling errorAndrey Kleshchev
2020-07-30SL-13626 Fix asset storage coroutine shutdownAndrey Kleshchev
2020-07-30SL-13704 Release notes link not loading in ToolsUpdate2 releaseAndrey Kleshchev
2020-07-30Revert part of SL-11216 due to reverting VVMAndrey Kleshchev
This reverts commit 31d9930a0ff7da5a6312a8f47037052cd2d06bdb.
2020-07-29Merge branch 'DRTVWR-476' into DRTVWR-501-maintAndrey Kleshchev
2020-07-29Merged in euclid-13406-lmr (pull request #219)Dave Houlton
SL-13406 fix an end-scope enable error in glow rendering
2020-07-29SL-13406 fix an end-scope enable error in glow renderingDave Houlton
2020-07-28SL-13634 Don't warn about convex decomposition issues if it's a stubAndrey Kleshchev
2020-07-28Nat's suggested improvement to LLThreadSafeQueue that takes account of queue ↵Callum Prentice
being empty as well as the status flag condition
2020-07-27SL-13650 Ice level Slider GraduationAndrey Kleshchev
2020-07-27SL-13688 Reverted viewer-manager to pre-tools buildAndrey Kleshchev
2020-07-24Merged in euclid-13406-lmr (pull request #215)Dave Houlton
SL-13406, glow disable no longer breaks rendering Approved-by: Michael Pohoreski
2020-07-24SL-13679 Event pump DupListenerName crash at loginAndrey Kleshchev
2020-07-24no-op change to trigger rebuildBrad Payne (Vir Linden)
2020-07-24SL-13406, cleanup and format changesDave Houlton
2020-07-24SL-13406, disable glow no longer disables all post passesDave Houlton
2020-07-23Merged in lmr4-merge-6.4.6 (pull request #213)Dave Houlton
Merge master v6.4.6 into DRTVWR-497 (VS2017)
2020-07-23Merge branch 'master' v6.4.6 into DRTVWR-497Dave Houlton
2020-07-23no-op change to force new DRTVWR-476 buildBrad Payne (Vir Linden)
2020-07-23SL-13642 Get rid of that ugly ignore -Wdelete-incompleteAndrey Lihatskiy
Get rid of that ugly '#pragma clang diagnostic ignored "-Wdelete-incomplete"' by making sure the delete always happens inside llview.cpp, where the type of LLView is known.
2020-07-22Mac buildfixAndrey Lihatskiy
2020-07-22SL-13642 Updated nghttp2, curl, googlemock, colladadom and boostAndrey Lihatskiy
Updated nghttp2 to codeticket version 545354 Updated boost to codeticket version 545361 Updated colladadom to codeticket version 545362 Updated googlemock to codeticket version 545363 Updated curl to codeticket version 545369
2020-07-22SL-13642 Updated contributions.txtAndrey Lihatskiy
2020-07-22Remove redundant LL_EXSTAT_ from enums.Nicky Dasmijn
2020-07-22Put hash for boost namespace properly into that by using namespace boostNicky Dasmijn
2020-07-22LLExtStat had been a S32, this wasn't right, as some of the constants lead ↵Nicky Dasmijn
to integer overflow: const LLExtStat LL_EXSTAT_RES_RESULT = 2L<<30; const LLExtStat LL_EXSTAT_VFS_RESULT = 3L<<30; This shifts into the sign bit and clang gets (rightfully) upset about this. LLExtStatus needs to be at least of type U32 to remedy this problem, but while at it it makes sense to turn it into what it is: An enum. Turning it into a class enum has the added benefit we get type safety for mostly free. Which incidentally turned up a problem right away: A call to removeAndCallbackPendingDownloads had status and extstatus reversed and thus was wrong.
2020-07-22There was an idiom to test with LL_DARWIN if the compiler used is clang. ↵Nicky Dasmijn
This is not correct, as clang is available on all 3 platforms. The correct way to check for this is via __clang__ (https://clang.llvm.org/docs/LanguageExtensions.html#builtin-macros)
2020-07-22Linux needs strcmp , include <string.h> so we get access to that function.Nicky Dasmijn
2020-07-21Merged in euclid-13416-lmr (pull request #208)Dave Houlton
SL-13416 eliminate sun/moon specular on shadowed surfaces. Cherry-picked from DRTVWR-510.
2020-07-21SL-13416 eliminate sun/moon specular on shadowed surfacesDave Houlton
2020-07-21DRTVWR-497 trigger another new buildDave Houlton
2020-07-20DRTVWR-497 trigger new buildDave Houlton
2020-07-20Merge branch 'master' into DRTVWR-501-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/newview/llimprocessing.cpp
2020-07-20Increment viewer version to 6.4.6Nat Goodspeed
following promotion of DRTVWR-476