summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
AgeCommit message (Collapse)Author
2023-04-03DRTVWR-489: Fix things up after a messy merge with main because of a ↵Callum Prentice
gigantic CMake patch. Sadly, my macOS box updated to Xcode14.3 overnight and that caused many warnings/errors with variables being initialized and then used but not in a way that affected anything.. Building on Xcode 14.3 also requires that MACOSX_DEPLOYMENT_TARGET be set to > 10.13. Waiting on a decision about that but checking this in in the meantime. Builds on macOS with appropriate build variables set for MACOSX_DEPLOYMENT_TARGET = 10.14 but not really expecting this to build in TC because (REDACTED). Windows version probably hopelessly broken - switching to that now.
2023-03-20Merge branch 'DRTVWR-568' into DRTVWR-573-maint-RAndrey Lihatskiy
# Conflicts: # indra/cmake/Copy3rdPartyLibs.cmake # indra/cmake/FindOpenJPEG.cmake # indra/cmake/OpenJPEG.cmake # indra/integration_tests/llui_libtest/CMakeLists.txt # indra/newview/CMakeLists.txt
2023-02-13Fix up a couple of tiny merge conflicts after a merge with mainCallum Prentice
2023-02-02Merge branch 'main' into DRTVWR-573-maint-RAndrey Lihatskiy
2023-01-20SL-14318 MacOS __write_nocancel crashAndrey Kleshchev
Multiple instances of viewer could write to the same uuid.inv file at the same time.
2023-01-03DRTVWR-575: Replace some LLSDArray() usage with llsd::array().Nat Goodspeed
It seems newer compilers have a different interpretation of exactly when to engage LLSDArray's copy constructor. In particular, this assignment: some_LLSD_map[key] = LLSDArray(...)(...)...; used to convert the LLSDArray object directly to LLSD; now it first calls the custom copy constructor, which embeds the intended array within an outer array before assigning it into the containing map. The newer llsd::array() function avoids that problem because what it returns is already an LLSD object. Taking inventory of LLSDArray assignments of that form turned up a number of workarounds like LLSD(LLSDArray(...)). Replacing those with llsd::array() is both simpler and more readable. Tip of the hat to Chorazinallen for surfacing this issue!
2022-12-12Merge branch 'main' into DRTVWR-568Callum Prentice
2022-12-12Merge branch 'main' into DRTVWR-570-maint-QAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/app_settings/shaders/class1/deferred/materialF.glsl # indra/newview/llfloater360capture.cpp
2022-11-22SL-18219 Crash getting and sending render info on exitAndrey Kleshchev
There might be other causes for sendRenderInfoToRegion and getRenderInfoFromRegion, crashing, but in some cases viewer was shutting down
2022-11-03SL-18565 Built-in bump maps and some environment textures fail to loadAndrey Kleshchev
Due to udp texture fetching no longer being present
2022-10-29Fix RenderAppleUseMultGL debug setting for enabling threaded GL engineRye Mutt
2022-10-24Merge master into DRTVWR-568 (and fix conflicts)Callum Linden
2022-10-20Merge branch 'master' into DRTVWR-565-maint-PAndrey Lihatskiy
2022-09-16Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into ↵Nicky Dasmijn
DRTVWR-568_cmake
2022-09-15Merge branch 'master' into DRTVWR-568Callum Linden
2022-09-15Merge branch 'master' into DRTVWR-548-maint-NAndrey Lihatskiy
# Conflicts: # indra/newview/llmodelpreview.h
2022-09-15Merge branch 'master' into DRTVWR-565-maint-PAndrey Lihatskiy
2022-08-24DRTVWR-558: Re-enable --leap command-line switch for dev builds.Nat Goodspeed
The --leap command-line switch is independent of updater processing. It should NOT be suppressed when the updater is suppressed. --leap is used for viewer testing, which is important for dev builds!
2022-08-04Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llpanelface.cpp # indra/newview/llpanelface.h # indra/newview/llpanelobject.cpp
2022-08-04Merge branch 'master' into DRTVWR-548-maint-NAndrey Lihatskiy
# Conflicts: # indra/newview/llfloaterworldmap.cpp # indra/newview/llvovolume.cpp
2022-08-04Merge branch 'master' into DRTVWR-565-maint-PAndrey Lihatskiy
2022-07-21Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into ↵Nicky
DRTVWR-543-maint_cmake
2022-07-19SL-17670 Simplify outfit snapshot floaterMnikolenko Productengine
2022-07-08SL-17727 FIXED Crash when specifying --graphicslevel option on macMaxim Nikolenko
2022-06-29Merge branch 'master' into DRTVWR-548-maint-NAndrey Lihatskiy
# Conflicts: # doc/contributions.txt # indra/newview/llviewercontrol.cpp
2022-06-29Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
2022-06-24SL-17329: Address Mac build errorCosmic Linden
2022-06-24SL-17329: Fix cache sizes due to overflow. Improve typing.Cosmic Linden
2022-06-22SL-17329: Fix texture cache not respecting DiskCachePercentOfTotalCosmic Linden
2022-06-17SL-17585 Crash at LLAppViewer::initConfigurationAndrey Kleshchev
2022-06-14SL-16182: Offload audio decoding from the main thread to the general work queue.Cosmic Linden
The work queue callback binds "this". This is deemed safe due to current dependencies, but see the associated comment in the return callback. There was some trial and error to get a this-binded lambda to compile. Due to LLVorbisDecodeState writing to disk off-thread, limit audio decodes proportional to general worker thread count. Guess the thread count for now.
2022-06-08SL-17546 Fix 'release' configuration build testsAndrey Kleshchev
2022-06-07SL-17546 Do not launch updater for a non-interactible instanceAndrey Kleshchev
2022-06-05Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into ↵Nicky
DRTVWR-543-maint_cmake
2022-05-31DRTVWR-544 post-merge fix (restored SL-14961)Andrey Lihatskiy
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-27DRTVWR-543 post-merge cleanupAndrey Lihatskiy
2022-05-27post-merge build fixAndrey Lihatskiy
2022-05-27Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/cmake/LLCommon.cmake # indra/llcommon/CMakeLists.txt # indra/llrender/llgl.cpp # indra/newview/llappviewer.cpp # indra/newview/llface.cpp # indra/newview/llflexibleobject.cpp # indra/newview/llvovolume.cpp
2022-05-26Merge branch 'master' into DRTVWR-548-maint-NAndrey Lihatskiy
2022-05-07Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into ↵Nicky
DRTVWR-543-maint_cmake
2022-05-04Merge branch master (D550) into DRTVWR-546Andrey Kleshchev
# Conflicts: # indra/newview/llappviewer.h
2022-05-04Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
2022-05-04Merge branch 'master' into DRTVWR-543-maint_cmakeAndrey Lihatskiy
2022-05-04Merge branch 'master' into DRTVWR-548-maint-NAndrey Lihatskiy
2022-04-29SL-17124 switchContext and loadShaderFile crashesAndrey Kleshchev
- Do not try initializing shaders if requirements are not met or if window does not exist - Warn user before closing window. Situation is unexpected, there is chance of more issues, like a freeze or a crash on close() - mHasMultitexture is a solid requirement, if it is not present, we won't be able to run
2022-04-21SL-17040 Crash due to LLWord not existingAndrey Kleshchev
LLWord should persist till the end due to wide usage.
2022-04-21SL-17159 Crash initializing LLInstanceTrackerPrivateAndrey Kleshchev
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 remote-tracking branch 'origin/master' into DRTVWR-550-mfaBrad Kittenbrink
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-14 20:21:53 +0000