summaryrefslogtreecommitdiff
path: root/indra/newview/llappviewer.cpp
AgeCommit message (Collapse)Author
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-09-09Merged in SL-17967 (pull request #1113)Howard Stearns
SL-17967 require 4.1 core profile
2022-09-01SL-18078, SL-18065 -- Experimentally allow uploading of lossless normal ↵Dave Parks
maps, fix for crash on shutdown.
2022-09-01Merge branch 'DRTVWR-559' of bitbucket.org:lindenlab/viewer into SL-17967Howard Stearns
2022-09-01SL-17967 - Git rid of ARB that is in coreHoward Stearns
2022-08-31SL-18065 WIP -- Adjust max virtual size to keep debug floater readable. ↵Dave Parks
Make assert on shutdown less frequent (still not gone, likely race condition). Fix unrelated assertion in reflection probes.
2022-08-30Merge remote-tracking branch 'remotes/origin/DRTVWR-563' into DRTVWR-559Dave Parks
2022-08-30SL-17997 Fix for crash on shutdownDave Parks
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-08SL-17927 Keep people from shooting themselves in the foot by twiddling ↵Dave Parks
deprecated settings.
2022-08-04Merge remote-tracking branch 'origin/master' into DRTVWR-559Brad Kittenbrink
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-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
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-20 20:50:35 +0000