summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermedia.cpp
AgeCommit message (Collapse)Author
2022-05-26Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
# Conflicts: # indra/newview/llviewertexturelist.cpp
2022-04-18Merge branch master (D540) into DRTVWR-546Andrey Kleshchev
# Conflicts: # indra/llcommon/llsdutil.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/lldrawpoolalpha.cpp # indra/newview/lldrawpoolwater.cpp
2022-04-18Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2022-03-02SL-16965 360 Snapshot tool fails to save file to computerAndrey Kleshchev
2022-03-01Merge branch 'master' (DRTVWR-557) into DRTVWR-546Andrey Kleshchev
# Conflicts: # autobuild.xml # doc/contributions.txt # indra/cmake/GLOD.cmake # indra/llcommon/tests/llprocess_test.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/lldrawpoolavatar.cpp # indra/newview/llfloatermodelpreview.cpp # indra/newview/llmodelpreview.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvovolume.cpp # indra/newview/viewer_manifest.py
2022-02-28Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
# Conflicts: # indra/newview/llviewermenu.cpp
2022-02-23Fix for media textures failing to update (and eating lots of memory) on ↵Dave Parks
Mac/Intel
2022-02-22SL-16815 Cleanup -- disable multithreaded bumpmap generation while tracking ↵Dave Parks
down loading issues, fix sync issue in single threaded mode in media textures, restore LL_IMAGEGL_THREAD_CHECK functionality
2022-02-17SL-16815 Remove frame stalls from occlusion queries, bumpmap updates, and ↵Dave Parks
querying for available video memory.
2022-02-14SL-16418 Media texture update stall fix. Make media texture updates use ↵Dave Parks
LLImageGL thread to update, fix AMD sync issue on ImageGL thread and install debug callbacks on LLImageGL thread when debug gl enabled.
2022-02-01Revert "Merged in euclid-16418 (pull request #846)"Dave Houlton
This reverts commit 40fe5277e1390c975d9a3184ff8fc46d69dfb450, reversing changes made to af830e5fc5840194be95140f644a27011b9b7e06.
2022-02-01Revert "Merged in euclid-16418-a (pull request #852)"Dave Houlton
This reverts commit dcf8f695367a1bcc9c495ea93a89927dd83802af, reversing changes made to 594910a8408f67f1af7c66d5a4dfde3626669245.
2022-01-31SL-16418 add tear-down lockDave Houlton
2022-01-27SL-16418 restore tracy macros stomped in mergeDave Houlton
2022-01-27SL-16418 rename media tex image per-update to avoid contention stallDave Houlton
2022-01-27SL-16418 bg thread for media texture updatesDave Houlton
2022-01-27SL-16418 optimize imageraw clearDave Houlton
2022-01-14SL-16606: Add profiler category MEDIAPtolemy
2022-01-14SL-16638 don't allow downloading files from the built-in browserMnikolenko Productengine
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-26Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2021-12-15DRTVWR-546 merge up to 6.5.2Dave Houlton
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-16DRTVWR-546 merge in master v6.5.1Dave Houlton
2021-11-16Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
# Conflicts: # indra/llui/lltextbase.h # indra/newview/VIEWER_VERSION.txt
2021-11-16Merge branch 'master' into DRTVWR-534Andrey Lihatskiy
# Conflicts: # indra/newview/VIEWER_VERSION.txt
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-10-07Fix: SL-12320 The Viewer functionality is broken with an in-viewer enabled proxyCallum Linden
2021-09-29SL-15999 - don't create floaters in noninteractive modeBrad Payne (Vir Linden)
2021-09-20SL-15999 - track --noninteractive state with gNonInteractive flagBrad Payne (Vir Linden)
2021-09-16SL-15999 - skip plugins in NonInteractive modeBrad Payne (Vir Linden)
2021-09-01SL-15867 User not logged in - very much the MVS (minimum viable solution) ↵Callum Linden
but by storing the OpenID cookie when it arrives then injecting it forcefully into each new media instance, it appears that the 'not logged in' problem is solved - at least in my testing, 20+ times logging in without a cache and profiles, dashboard etc. were all logged in - QA will confirm. The full solution involves providing a separate cache for each media instance and tightening up the CEF cookie calling code - that is a large project and this is sufficient for now
2021-08-20DRTVWR-534: Batch of modifications to 360 capture project after moving from ↵Callum Prentice
internal repo to public one.
2021-08-10Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2021-08-10Merge branch 'master' into DRTVWR-530-maintAndrey Lihatskiy
2021-07-23Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
# Conflicts: # indra/newview/llpanelpicks.cpp # indra/newview/llpanelpicks.h # indra/newview/llviewerfloaterreg.cpp
2021-07-19Merge with Master after Viewer Release (also fixed some glaring automerge ↵Callum Prentice
screw ups)
2021-07-19Merge branch 'master' into DRTVWR-530-maintAndrey Lihatskiy
2021-07-12Fix for SL-15559 PDF files do not load in CEF v91Callum Prentice
2021-05-14Fixes SL-14897 Disable Flash support in the embedded browserCallum Prentice
2021-04-27SL-14664 Added zoomout and sizeallAndrey Kleshchev
Remade code to use getCursorFromString
2021-04-26SL-14664 Increase range of supported cursors on prim's mediaAndrey Kleshchev
2021-03-18SL-13910 Failed to upload image to your Profile FeedAndrey Kleshchev
Looks like viewer is missing some certs in the bundle or doesn't know how to handle web page's certs. For now disabling verification to not block DRTVWR-516. Verification was originally turned on in DRTVWR-516's SL-13927
2021-02-01Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2020-12-07SL-14484 'Stop All' media button sometomes is not avaliable for videoAndrey Kleshchev
2020-11-11Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/llpanelavatar.cpp
2020-08-18Merge branch 'master' into DRTVWR-483Andrey Lihatskiy
2020-08-18Merge branch 'master' into DRTVWR-507-maintAndrey Lihatskiy
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-30 03:47:43 +0000