summaryrefslogtreecommitdiff
path: root/indra/newview/app_settings
AgeCommit message (Collapse)Author
2022-01-14SL-11841 Correct settingAndrey Lihatskiy
2022-01-11Revert "SL-11841 make ‘Push to talk’ the default setting"Andrey Lihatskiy
+ post merge conflict fix
2022-01-10Merge branch 'DRTVWR-530-maint' into DRTVWR-553-maint-mix-JKAndrey Lihatskiy
# Conflicts: # indra/newview/app_settings/key_bindings.xml # indra/newview/llappviewer.cpp # indra/newview/llkeyconflict.cpp
2021-12-15Merge branch 'master' into DRTVWR-530-maintAndrey Lihatskiy
2021-12-15Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maintAndrey Kleshchev
# Conflicts: # indra/media_plugins/cef/media_plugin_cef.cpp - setOnLoadEndCallback # indra/newview/llviewerassetstorage.cpp - mAssetCoroCount
2021-11-16Merge branch 'DRTVWR-519' into DRTVWR-552-cache-360Andrey Lihatskiy
# Conflicts: # indra/newview/app_settings/settings.xml
2021-11-16Merge branch 'master' into DRTVWR-534Andrey Lihatskiy
# Conflicts: # indra/newview/VIEWER_VERSION.txt
2021-11-16Merge branch 'master' into DRTVWR-519Andrey Lihatskiy
# Conflicts: # README.md
2021-11-16Merge branch 'master' into DRTVWR-530-maintAndrey Lihatskiy
# Conflicts: # doc/contributions.txt
2021-11-16Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/newview/installers/windows/lang_pl.nsi # indra/newview/llfloaterpreference.cpp # indra/newview/llinventorymodel.cpp
2021-09-21Revert "SL-11841 make ‘Push to talk’ the default setting"Andrey Kleshchev
This reverts commits: 126877bc5ba45ff6b0b31368c55f894a0beaf5bf b661f62a7ad4dad9806eda8f4c8f2c9d64b3efbb ce660c7e7bb6e19a23d634fb6d3249330bf2d74c
2021-09-21SL-11841 make ‘Push to talk’ the default settingAndrey Kleshchev
2021-09-17SL-11841 make ‘Push to talk’ the default settingAndrey Kleshchev
2021-09-09SL-11841 make ‘Push to talk’ the default settingMnikolenko Productengine
2021-09-03Merge branch 'DRTVWR-522-maint' into DRTVWR-545-maint-mixAndrey Lihatskiy
# Conflicts: # indra/newview/llappviewer.cpp # indra/newview/llappviewerwin32.cpp # indra/newview/llmachineid.cpp
2021-09-01SL-11841 make ‘Push to talk’ the default settingMnikolenko Productengine
2021-08-31SL-15768 Restored collision sound default behaviourAndrey Kleshchev
2021-08-30SL-15918 Experimental feature to perform multiple render passes and reduce ↵Callum Prentice
missing content - additional - 3 passes seems to work better than 2
2021-08-30SL-15918 Experimental feature to perform multiple render passes and reduce ↵Callum Prentice
missing content - fixed
2021-08-20DRTVWR-534: Batch of modifications to 360 capture project after moving from ↵Callum Prentice
internal repo to public one.
2021-08-19SL-15853 Added the Map icon to bottom toolbar defaultsAndrey Lihatskiy
2021-08-10Merge branch 'master' into DRTVWR-519 after Viewer releaseCallum Prentice
2021-08-10Merge branch 'master' into DRTVWR-530-maintAndrey Lihatskiy
2021-08-10Merge branch 'master' into DRTVWR-527-maintAndrey Lihatskiy
2021-08-10Merge branch 'master' into DRTVWR-522-maintAndrey Lihatskiy
2021-08-10Merge remote-tracking branch 'origin/master' into DRTVWR-521-maintAndrey Lihatskiy
2021-07-19Merge with Master after Viewer Release (also fixed some glaring automerge ↵Callum Prentice
screw ups)
2021-07-20Merge branch 'master' into DRTVWR-521-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/llcommon/llerror.cpp # indra/llui/llnotifications.h # indra/newview/llappviewer.cpp # indra/newview/llappviewermacosx.cpp
2021-07-19Merge with tip of Master after a Viewer releaseCallum Prentice
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-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-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
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-07 03:21:19 +0000