summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
AgeCommit message (Collapse)Author
2021-07-19Merge with tip of Master after a Viewer releaseCallum Prentice
2021-07-19Merge branch 'master' into DRTVWR-540-maintAndrey Lihatskiy
2021-07-19Merge branch 'master' into DRTVWR-530-maintAndrey Lihatskiy
2021-07-19Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
2021-07-19Merge branch 'master' into DRTVWR-522-maintAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/llappcorehttp.cpp # indra/newview/llappcorehttp.h
2021-07-15SL-443 Keybindings: Backward compatibility #2Andrey Kleshchev
2021-07-15SL-443 Keybindings: Backward compatibilityAndrey Kleshchev
2021-07-15SL-443 Keybindings: Support reassigment of script interaction buttonAndrey Kleshchev
2021-07-05SL-15527 remove redundant flagMnikolenko Productengine
2021-07-01SL-15507 Remove no longer used search token and no longer used search URLMnikolenko Productengine
2021-06-25SL-11589: Fix horizon being U shaped bent in Low+ qualityPtolemy
2021-06-25Merge branch 'master' into DRTVWR-530-maintAndrey Lihatskiy
2021-06-25Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llinventorypanel.cpp
2021-06-25Merge branch 'master' into DRTVWR-522-maintAndrey Lihatskiy
# Conflicts: # indra/newview/app_settings/settings.xml
2021-06-25Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
2021-06-25Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
# Conflicts: # indra/newview/app_settings/settings.xml # indra/newview/llvoicevivox.cpp
2021-06-24Merge branch 'master' into DRTVWR-531Callum Prentice
2021-06-24Merge branch 'master' into DRTVWR-519Callum Prentice
2021-06-24Merge branch 'master' v 6.4.21 into DRTVWR-528Dave Houlton
2021-06-10Fix for SL-15381 Import Vivox VAD voice fixes into 'Viewer UI changes' branchCallum Prentice
2021-06-09SL-15363 how_to on older viewers is forced to persistAndrey Kleshchev
Older how_to floater is not set to persist in between sessions and gets stuck, ranamed new how_to into guidebook to avoid the issue
2021-06-07Merge with tip of Master after Viewer releaseCallum Prentice
2021-06-07Merge branch 'master' into DRTVWR-531Callum Prentice
2021-06-07Merge branch 'master' into DRTVWR-530-maintAndrey Lihatskiy
2021-06-07Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
2021-06-07Merge branch 'master' into DRTVWR-522-maintAndrey Lihatskiy
2021-06-07Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
# Conflicts: # doc/contributions.txt
2021-06-07Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
2021-06-07Merge branch 'master' into DRTVWR-516-maintAndrey Lihatskiy
2021-05-19SL-15268 update the description of the 'VivoxVadSensitivity' debug settingMnikolenko Productengine
2021-05-14Fixes SL-14897 Disable Flash support in the embedded browserCallum Prentice
2021-05-13Merge branch 'DRTVWR-533' into DRTVWR-516-maintAndrey Lihatskiy
2021-05-12BUG-230673: Trim asset disk cache regularlyAnsariel
2021-04-30Merge branch 'master' into DRTVWR-530-maintAndrey Lihatskiy
2021-04-30Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
2021-04-30Merge branch 'master' into DRTVWR-522-maintAndrey Lihatskiy
# Conflicts: # doc/contributions.txt
2021-04-30Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
2021-04-29Expose the flag to turn automatic VAD on and off. We will likely keep it ↵Callum Prentice
off since that appears to be working well for us but others may want to turn in on
2021-04-29SL-14113: Merge duplicate shader constant for clarity.Ptolemy
2021-04-29SL-14113: Remove magic numbers. Take advantage of existing shader #defines ↵Ptolemy
injection by extending shader loading to make use of addConstant() instead of hard-coding magic number constants in each GLSL file.
2021-04-29SL-14113 Cleanup typo and cross referencePtolemy
2021-04-29SL-14113 Fix moon hazePtolemy
2021-04-29Clean up a merge conflictCallum Prentice
2021-04-29Merge remote-tracking branch 'origin/master' into DRTVWR-533Callum Prentice
2021-04-29DRTVWR-528 merge up to 6.4.19Dave Houlton
2021-04-29Merge master (DRTVWR-515) into DRTVWR-516-maintAndrey Kleshchev
# Conflicts: # autobuild.xml # doc/contributions.txt # indra/llcommon/llcoros.cpp # indra/llmessage/llcoproceduremanager.cpp # indra/newview/llfloaterfixedenvironment.cpp # indra/newview/llfloaterimsessiontab.cpp
2021-04-29Merge master into DV525-merge-6.4.19Dave Houlton
2021-04-29Merge branch 'master' into DRTVWR-518-uiAndrey Lihatskiy
# Conflicts: # indra/newview/llfloaterfixedenvironment.cpp # indra/newview/skins/default/xui/en/strings.xml
2021-04-29SL-15177 Fix the way of counting for gTextureTimerMnikolenko Productengine
2021-04-29SL-15177 Added LLTextureFetchTester to log texture fetching state timersMnikolenko Productengine
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-01 10:19:41 +0000