summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
AgeCommit message (Collapse)Author
2022-07-12Post-merge conflict fixAndrey Lihatskiy
2022-07-12Merge branch 'master' into DRTVWR-528Andrey Lihatskiy
# Conflicts: # indra/newview/llappviewer.cpp
2022-07-08SL-17727 FIXED Crash when specifying --graphicslevel option on macMaxim Nikolenko
2022-06-29Merge branch 'master' (DRTVWR-543) into DRTVWR-559Andrey Kleshchev
# Conflicts: # autobuild.xml # indra/llrender/llgl.cpp # indra/newview/CMakeLists.txt # indra/newview/llvovolume.cpp
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-09SL-17483: Merge branch 'DRTVWR-563' of viewer into sl-17483Nat Goodspeed
2022-06-09SL-17483: Recast LLImageDecodeThread as a facade for ThreadPool.Nat Goodspeed
Remove all references to LLQueuedThread (but emulate a couple bits of its API such as handle_t and getPending()). Migrate ImageRequest into llimageworker.cpp. It has never been part of LLImageDecodeThread's public API. Remove ImageRequest tests. Remove all references to LLImageDecodeThread::pause(). The idea of pausing another thread is bizarre to me, and LLThreadPool has no such operation. Nor does it have an abortRequest().
2022-06-09SL-17483: Merge branch 'track-threadpools' into sl-17483.Nat Goodspeed
This picks up ThreadPoolSizes override logic embedded in ThreadPool's constructor, plus the new static ThreadPool::getConfiguredWidth() and getWidth() methods.
2022-06-09SL-17483: Simplify ThreadPool instantiations.Nat Goodspeed
Now that LL::ThreadPool's constructor has subsumed the work of discovering a runtime override width, LLAppViewer::initGeneralThread() can simply pass the compile-time default width instead of redundantly checking ThreadPoolSizes. Also the default ThreadPool capacity has been bumped up to what "General" and "LLImageGL" were requesting, so they need not pass that explicitly or explain in comments why they're doing it. But until we start throwing work at the "General" ThreadPool, configure it down to 1 thread in settings.xml.
2022-06-08SL-17546 Fix 'release' configuration build testsAndrey Kleshchev
2022-06-07SL-17547 Fix for crash on shutdown cleaning up LLLFSThreadDave Parks
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-31SL-17484 Fix for unit tests. Deprecate non-threaded LLQueuedThread and make ↵Dave Parks
lllfsthread threaded.
2022-05-31SL-17490 Only update a subset of textures each frame and remove dead debug code.Dave Parks
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' v 6.6.1 into DRTVWR-528Dave Houlton
2022-05-26Merge branch 'master' into DRTVWR-548-maint-NAndrey Lihatskiy
2022-05-18SL-17219: Merge 'DRTVWR-546' of lindenlab/viewer into SL-17219Nat Goodspeed
Update task branch from main project branch.
2022-05-16Merge remote-tracking branch 'remotes/origin/DRTVWR-546' into DRTVWR-559Dave Parks
2022-05-07Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into ↵Nicky
DRTVWR-543-maint_cmake
2022-05-05Merge branch 'master' v 6.5.6 into DRTVWR-528Dave Houlton
2022-05-04Merge remote-tracking branch 'origin/master' into DRTVWR-559Brad Kittenbrink
2022-05-04Merge branch master (D550) into DRTVWR-546Andrey Kleshchev
# Conflicts: # indra/newview/llappviewer.h
2022-05-04SL-17283 LLReflectionMapManager prototype. Remove snapshot code related ↵Dave Parks
overhead from reflection map renders. Add parallax correction and support for multiple reflection maps.
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' into DRTVWR-528Dave Houlton
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
2022-04-18Merge remote-tracking branch 'origin/DRTVWR-543-maint' into ↵Nicky
DRTVWR-543-maint_cmake
2022-04-18Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/newview/app_settings/settings.xml # indra/newview/llfloatersearch.cpp # indra/newview/llgroupactions.cpp # indra/newview/llvovolume.cpp
2022-04-18Merge branch 'master' into DRTVWR-548-maint-NAndrey Lihatskiy
2022-04-18Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
2022-04-18Correctio for preproc #elseNicky
2022-04-15SL-17219 WIP - Texture pipeline overhaulDave Parks
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-20 12:31:36 +0000