summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-11-13Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llfloatereditextdaycycle.cpp # indra/newview/llfloaterfixedenvironment.cpp
2020-11-13Merge remote-tracking branch 'origin/master' into DRTVWR-517Brad Payne (Vir Linden)
2020-11-13SL-14312 Show simulator host names for AWS hosted regionsMnikolenko Productengine
2020-11-13SL-14303 Wearable type label should contain translated intead of default stringAndrey Kleshchev
Startup has two initStrings calls, only after second one LLtrans will return properly translated calls, but we don't want 'translated' for logging, so modified logging to not use getTypeLabel.
2020-11-13Merged in DRTVWR-519 (pull request #373)Maxim Nikolenko
SL-14269 FIXED Textures are corrupt after reducing the cache size. Approved-by: Callum Linden
2020-11-12SL-14269 FIXED Textures are corrupt after reducing the cache size.Mnikolenko Productengine
2020-11-12Merged in DV510-merge-6.4.12 (pull request #372)Dave Houlton
DRTVWR-510 merge in 6.4.12
2020-11-12SL-13278 Restored missing propertiesAndrey Lihatskiy
2020-11-11Merge branch 'master' 6.4.12 into DRTVWR-510Dave Houlton
2020-11-11SL-14275: Comment out unused global consts for compilers that treat this an ↵Ptolemy
an error
2020-11-12Mac buildfixAndrey Lihatskiy
2020-11-11Merge branch 'master' (DRTVWR-507-maint) into DRTVWR-521-maintAndrey Kleshchev
# Conflicts: # autobuild.xml # indra/llcommon/llerror.cpp
2020-11-11Merge branch 'master' into DRTVWR-519Callum Prentice
2020-11-11SL-14201 pulled in updated dullahan branch (after merge from D507)Andrey Kleshchev
2020-11-11Merge branch 'master' into DRTVWR-520-apple-notarizationAndrey Lihatskiy
2020-11-11Post-merge leftover cleanup; buildfixAndrey Lihatskiy
2020-11-11Merged master (DRTVWR-507) into DRTVWR-514-keymappingsAndrey Kleshchev
2020-11-11Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/llui/llfolderviewmodel.h # indra/newview/lltexturecache.cpp # indra/newview/llviewermenu.h # indra/newview/skins/default/xui/en/menu_wearable_list_item.xml
2020-11-11Increment viewer version to 6.4.12Nat Goodspeed
following promotion of DRTVWR-507
2020-11-11reverted part of SL-10625 since it is now obsoleteAndrey Kleshchev
see SL-13565
2020-11-11Revert "SL-13565, remove SL-10625 throttling erroneously applied to all GPUs"Andrey Kleshchev
This reverts commit d77b7bdc5484fab731f7537a15d690a1e022c246.
2020-11-11Revert "SL-13565, clean up now-orphaned throttling variable and handling code"Andrey Kleshchev
This reverts commit 6c1a15d936763dc14f368e10bd53c6e351bf0136.
2020-11-11Merged in SL-14275 (pull request #367)Michael Pohoreski
SL-14275 Approved-by: Dave Houlton
2020-11-10SL-14209 Saving notecard in object sometimes erases all contentAndrey Kleshchev
2020-11-10SL-14303 Fix LLWearableType to not spam in logsAndrey Kleshchev
2020-11-10SL-14264 - ViewerStats added logging of most gGLManager fieldsBrad Payne (Vir Linden)
2020-11-09SL-14275: Replace enum with S32 to better match reflection_detailPtolemy
2020-11-09SL-13599 Fixed missing zeroAndrey Kleshchev
2020-11-06SL-14270 Crash fixAndrey Kleshchev
2020-11-06SL-14276 The L$ balance in viewer is not updated on group creationAndrey Kleshchev
2020-11-06SL-13283 Update favicons with new logoMnikolenko Productengine
2020-11-06SL-14203 add menu items to open Linden Homes and Premium Membership web pagesMnikolenko Productengine
2020-11-06Reapplied SL-11215: Add release notes URLs to update-related notifications.Andrey Kleshchev
In scope of SL-13740 work, this reverts commit 1935d25c78bf46f0fdc8758b6f215f53d17fd94a.
2020-11-06SL-13740 Updated updaterAndrey Kleshchev
2020-11-05SL-14275: Cleanup: Detabify generateWaterReflection()Ptolemy
2020-11-05SL-14275: Cleanup: Add indentation for some push/pop RenderTypeMask()Ptolemy
2020-11-05SL-14275: Implement two new water reflection modesPtolemy
2020-11-05SL-14275: Cleanup DetabifyingPtolemy
2020-11-05SL-14275: Don't render clouds in water reflectionPtolemy
2020-11-05SL-14275: Cleanup inconsistent indentationPtolemy
2020-11-05SL-14275: Cleanup non descript name for water reflection modePtolemy
2020-11-05SL-14275: Add two new Water Reflection modes to Graphics AdvancedPtolemy
2020-11-05SL-14270 A bit of cleanup #2Andrey Kleshchev
2020-11-05SL-14270 A bit of cleanup #1Andrey Kleshchev
2020-11-05SL-14270 Crash accessing deleted 'parent' via callback from childAndrey Kleshchev
2020-11-04Merge branch 'SL-14264' into DRTVWR-507-maintAndrey Lihatskiy
2020-11-04Fix for RelWithDebInfoOS buildAndrey Kleshchev
2020-11-04SL-14201 Fix Altgr in CEF #2Andrey Kleshchev
2020-11-04SL-14264 - BOM textureBrad Payne (Vir Linden)
2020-11-04SL-13826 Open a new inventory floater for "Find original" and "Show ↵Mnikolenko Productengine
original" result