summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-08-18BuildfixAndrey Lihatskiy
# Conflicts: # indra/newview/llviewermenufile.cpp
2020-08-18BuildfixAndrey Lihatskiy
2020-08-18Merge branch 'master' 6.4.8 into DRTVWR-497Dave Houlton
2020-08-18Merge branch 'master' into DRTVWR-514-keymappingsAndrey Lihatskiy
2020-08-18Merge remote-tracking branch 'origin/master' into SL-13705Brad Payne (Vir Linden)
2020-08-18Merge branch 'master' 6.4.8 into DRTVWR-510Dave Houlton
2020-08-18Merge branch 'master' into DRTVWR-482Andrey Lihatskiy
2020-08-18Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llimprocessing.cpp
2020-08-18Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llimprocessing.cpp # indra/newview/llviewerjoystick.cpp # indra/newview/llviewermenufile.cpp
2020-08-18Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
2020-08-18Merge branch 'master' into DRTVWR-503-maintAndrey Lihatskiy
2020-08-18Increment viewer version to 6.4.8Nat Goodspeed
following promotion of DRTVWR-501
2020-08-18SL-13801 The"Hover Height" floater should be closed after pressing the ↵Mnikolenko Productengine
"Ctrl-alt-H" shortcut keys
2020-08-18SL-13783 Workaround for enqueueCoprocedure() crash #2Andrey Kleshchev
2020-08-17Merged in SL-13465 (pull request #239)Michael Pohoreski
Approved-by: Dave Houlton
2020-08-17Merged in SL-13783 and SL-13789Andrey Kleshchev
2020-08-17SL-13789 Crash 'Enqueue failed' due to viewer requesting over 4K landmarksAndrey Kleshchev
2020-08-17SL-13783 Workaround for enqueueCoprocedure() crash with asset storageAndrey Kleshchev
2020-08-17SL-13784 Highlight friends' names in Conversations floaterMnikolenko Productengine
2020-08-16SL-13465 Fix local scalar mix masking global mix() function.Ptolemy
2020-08-16SL-13465 Partially restore atmospheric effects for the moon.Ptolemy
2020-08-14Merge remote-tracking branch 'origin/master' into SL-12995Brad Payne (Vir Linden)
2020-08-14SL-13705 - bug fixes and commentsBrad Payne (Vir Linden)
2020-08-14SL-13293 Fixed reshape behavior for scale changeAndrey Kleshchev
2020-08-13Merged in DV497-merge-6.4.7 (pull request #237)Dave Houlton
Merge master v6.4.7 to LMR#4 DRTVWR-497
2020-08-13Merge branch 'master' 6.4.7 into DRTVWR-497Dave Houlton
2020-08-13SL-13149 FIXED URLs copied from MoaP have 6 space characters at the beginningMnikolenko Productengine
2020-08-13SL-13705 - modified_strings.py handles more casesBrad Payne (Vir Linden)
2020-08-12SL-13583 Some behavior tweaks #2Andrey Kleshchev
2020-08-12SL-13705 - modified_strings.py added, for translation supportBrad Payne (Vir Linden)
2020-08-12SL-13583 Some behavior tweaks #1Andrey Kleshchev
2020-08-11Merged in DV510-merge-6.4.7 (pull request #235)Dave Houlton
Merge master 6.4.7 into DRTVWR-510
2020-08-11DRTVWR-482 Use proper reshape procedure and fix hidden bordersAndrey Kleshchev
2020-08-11SL-13731 FIXED Issue with selecting custom preset while in 'Object view' modeMnikolenko Productengine
2020-08-11SL-13698 Mac build fixAndrey Kleshchev
2020-08-11Merge branch 'master' v6.4.7 into DRTVWR-510Dave Houlton
2020-08-11BuildfixAndrey Kleshchev
2020-08-11SL-13705 - modified-strings.sh added, for translation supportBrad Payne (Vir Linden)
2020-08-11Merge branch 'master' into DRTVWR-515-maintAndrey Lihatskiy
2020-08-11Merge branch 'master' into DRTVWR-513-maintAndrey Lihatskiy
2020-08-11Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
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-11Merged master into DRTVWR-482Andrey Kleshchev
2020-08-11Merged master into DRTVWR-514-keymappingsAndrey Kleshchev
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-10SL-13669 tests should cover import/export category from llsdMnikolenko Productengine
2020-08-10SL-3704 Give plugins some time to terminateAndrey Kleshchev
requestExit() doesn't close CEF, command sets CEF into closing state which will be processed on update()
2020-08-10SL-13618 FIXED uri's stuck showing "Loading..." in chat or dialog if more ↵Mnikolenko Productengine
than one name is not cached.
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-16 00:20:54 +0000