summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermedia.cpp
AgeCommit message (Collapse)Author
2024-05-16Merge tag '7.1.7-release'Erik Kundiman
source for viewer 7.1.7.8974243247
2024-04-29#824 Process source files in bulk: replace tabs with spaces, convert CRLF to ↵Andrey Lihatskiy
LF, and trim trailing whitespaces as needed
2024-01-18GNU/Linux internal web browserErik Kundiman
The lllibs need to be built as static libs now, otherwise SLPlugin would lose reference to gSavedSettings. The media plugins still need to be built as dynamic libs however, so they can't rely on the condition in LibraryInstall.cmake any more. Since the Megapahit viewer, when built using GCC, is using the default value for _GLIBCXX_USE_CXX11_ABI (which is 1 for the newer C++11 ABI as opposed to 0 for the older C++03 ABI), the Dullahan dependency needs to be built with the very same _GLIBCXX_USE_CXX11_ABI setting too, otherwise apr_dso would fail at loading libmedia_plugin_cef.so because of the failure to refer to the setOnConsoleMessageCallback function with strictly the same (not differing between std::__cxx11::basic_string vs. std::basic_string) parameter types. The CEF build is Spotify's, so no live streaming support, while the Dullahan package used by the viewer was built using Kokua's dullahan fork. After rebuilding it with _GLIBCXX_USE_CXX11_ABI kept at default by not overriding it in variables (from the build-variables repo), the order of the target link libraries in CEFPlugin.cmake doesn't seem to matter any more (it did before!). Now EXTERNAL_TOS can be safely omitted from GNU/Linux added compile definitions (but still used on FreeBSD).
2023-06-01DRTVWR-559 Revert skies to be very close to release and disable tone mapping ↵RunitaiLinden
when probe ambiance is zero. Hack for desaturating legacy materials has been removed for performance and quality reasons. Adds a new setting for auto adjusting legacy skies. This is the PBR "opt out" button. If disabled, legacy skies will disable tonemapping, automatic probe ambiance, and HDR/exposure. If enabled, legacy skies will behave as if probe ambiance and HDR scale are 1.0, and ambient will be cut in half. HDR scale will act as a sky brightener, but will automatically adjust dynamic exposure so the sky will be properly exposed. If you want relatively even exposure all the time, set HDR Scale to 1.0. If you want a high range of exposures between indoor/dark areas and outdoor/bright areas, increase HDR Scale. Also tuned up SSAO (thanks Rye!). Reviewed with Brad.
2023-04-11SL-19564 Rebalance exposure and sky. Hack legacy diffuse map saturation and ↵RunitaiLinden
brightness to allow ACES Hill all the time.
2023-04-05SL-19331: Move media updates off-thread on select hardware (#153)cosmic-linden
* SL-19331: Have media updates on the LLImageGL thread even when texture updates are on the main thread. Add config. Off-thread media updates seem work best performance-wise when using glTexImage2D, not sub_image_lines. Otherwise, there are lots of main thread stalls. * SL-19331: Bump featuretable * SL-19331: Cleanup, annotate comment
2023-04-03SL-19331: Add comment on reason for revertCosmic Linden
2023-04-03Revert "SL-19331: No need to create texture in doMediaTexUpdate - should ↵Cosmic Linden
already be handled by preMediaTexUpdate" This reverts commit bf9d090045d7baf72f2ba7eadab0adc9d5c8f553.
2023-03-30SL-19331: Unlock mutex when bailing out from bad (hopefully doesn't happen) ↵Cosmic Linden
media state
2023-03-29SL-19331: Clarify that mipmapping on media prims being disabled is known ↵Cosmic Linden
behavior that should be corrected at some point
2023-03-29SL-19331: When initializing a media prim, set the mipmap state correctly ↵Cosmic Linden
from the beginning
2023-03-29SL-19331: No need to create texture in doMediaTexUpdate - should already be ↵Cosmic Linden
handled by preMediaTexUpdate
2022-09-28SL-18240 Don't disable HUD media when "Obscure MOAP" is active on landMnikolenko Productengine
2022-09-15Merge branch 'master' into DRTVWR-565-maint-PAndrey Lihatskiy
2022-08-31Merge branch 'master' into DRTVWR-565-maint-PAndrey Lihatskiy
# Conflicts: # indra/newview/llfloateroutfitsnapshot.cpp
2022-08-31Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llpanelpicks.cpp # indra/newview/llpanelprofile.cpp
2022-07-27SL-17809 Sounds from Avatar position instead of Camera positionMnikolenko Productengine
2022-05-31Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/llprimitive/llmodel.cpp # indra/llprimitive/llmodel.h # indra/newview/llappviewer.cpp # indra/newview/llappviewer.h
2022-05-30SL-16297 Don't play moap located outside the parcel, If an agent is standing ↵Mnikolenko Productengine
in a parcel with this flag set
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)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-27 09:49:47 +0000