summaryrefslogtreecommitdiff
path: root/indra/newview/CMakeLists.txt
AgeCommit message (Collapse)Author
2022-06-29SL-17685 Drag and drop material supportDave Parks
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-21SL-17600 WIP -- Proper radiance maps (not just mipped cubemaps).Dave Parks
2022-06-14SL-17586 WIP -- LLMaterialEditor prototype and "New Material" inventory buttons.Dave Parks
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-06Merged in SL-17274 (pull request #964)Michael Pohoreski
SL-17274: Stub for PBR DrawPool and shader Approved-by: Euclid Linden Approved-by: Dave Parks
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-02SL-17274: Stub for PBR DrawPool and shaderPtolemy
2022-04-28SL-17281 environment map prototype (stupid slow and hacky, but provides a ↵Dave Parks
way to get a "real" environment map for shader development)
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-543-maintAndrey Lihatskiy
2022-02-28Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
2022-01-27SL-16717 Rename RenderGLCoreProfile to prevent compatibility issuesAndrey Kleshchev
2022-01-12SL-16614 Viewer's uploader crash with RenderGLCoreProfileAndrey Kleshchev
2022-01-11SL-16614 Viewer's uploader crash with RenderGLCoreProfileAndrey Kleshchev
2021-12-26Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
2021-12-26Merge branch 'master' into DRTVWR-540-maintAndrey Lihatskiy
2021-12-15DRTVWR-546 merge up to 6.5.2Dave Houlton
2021-12-03SL-16436 and SL-16327 Fix for RenderDebugGL test failures and fix for grey ↵Dave Parks
textures
2021-11-29Merge branch 'DRTVWR-542-meshopt' into DRTVWR-546Andrey Kleshchev
2021-11-24DRTVWR-546, SL-16220, SL-16094: Undo previous glthread branch revert.Nat Goodspeed
Reverting a merge is sticky: it tells git you never want to see that branch again. Merging the DRTVWR-546 branch, which contained the revert, into the glthread branch undid much of the development work on that branch. To restore it we must revert the revert. This reverts commit 029b41c0419e975bbb28454538b46dc69ce5d2ba.
2021-11-19Merge branch 'master' into DRTVWR-540-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llfloatereditextdaycycle.cpp # indra/newview/llviewerinput.cpp
2021-11-19Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
# Conflicts: # indra/newview/llagentwearables.cpp # indra/newview/llvoicevivox.cpp
2021-11-16DRTVWR-546 merge in master v6.5.1Dave Houlton
2021-11-16Merge branch master (DRTVWR-545) into DRTVWR-542-meshoptAndrey Kleshchev
2021-11-16Merge branch 'DRTVWR-519' into DRTVWR-552-cache-360Andrey Lihatskiy
# Conflicts: # indra/newview/app_settings/settings.xml
2021-11-16Merge branch 'master' into DRTVWR-534Andrey Lihatskiy
# Conflicts: # indra/newview/VIEWER_VERSION.txt
2021-11-16Merge branch 'master' into DRTVWR-519Andrey Lihatskiy
# Conflicts: # README.md
2021-11-15Revert "SL-16220: Merge branch 'origin/DRTVWR-546' into glthread"Dave Houlton
This reverts commit 5188a26a8521251dda07ac0140bb129f28417e49, reversing changes made to 819088563e13f1d75e048311fbaf0df4a79b7e19.
2021-11-10SL-14403 Removed glodAndrey Kleshchev
2021-11-10SL-16094: Statically link to Windows IMM32.LIB.Nat Goodspeed
llwindowwin32.cpp's LLWinImm class used to dynamically load IMM32.DLL and populate its methods using GetProcAddress(). That was to support Windows XP. Since we've dropped Windows XP, use static linking instead, with dramatically fewer lines of code (and less of a thread safety alarm trigger). We retain the LLWinImm wrapper class only as a hook for Tracy instrumentation.
2021-11-04SL-16299 fix warning about CFBundleIdentifier not matching ↵Brad Kittenbrink
PRODUCT_BUNDLE_IDENTIFIER
2021-11-02Manually resolving conflicts after merge with DRTVWR-520Andrey Kleshchev
This reverts commit 0a745b47880fb16b1db8cd3327377a383dbfe6a8.
2021-11-02Merge remote-tracking branch 'origin/master' into DRTVWR-540-maintAndrey Kleshchev
# Conflicts: # autobuild.xml # indra/newview/CMakeLists.txt # indra/newview/installers/darwin/apple-notarize.sh # indra/newview/llappviewermacosx.cpp # indra/newview/llappviewerwin32.h # indra/newview/viewer_manifest.py # indra/win_crash_logger/llcrashloggerwindows.cpp
2021-10-22SL-16220: Merge branch 'master' into sl-16220Nat Goodspeed
2021-10-22SL-16220: Add LL::ThreadPool class and a "General" instance.Nat Goodspeed
ThreadPool bundles a WorkQueue with the specified number of worker threads to service it. Each ThreadPool has a name that can be used to locate its WorkQueue. Each worker thread calls WorkQueue::runUntilClose(). ThreadPool listens on the "LLApp" LLEventPump for shutdown notification. On receiving that, it closes its WorkQueue and then join()s each of its worker threads for orderly shutdown. Add a settings.xml entry "ThreadPoolSizes", the first LLSD-valued settings entry to expect a map: pool name->size. The expectation is that usually code instantiating a particular ThreadPool will have a default size in mind, but it should check "ThreadPoolSizes" for a user override. Make idle_startup()'s STATE_SEED_CAP_GRANTED state instantiate a "General" ThreadPool. This is function-static for lazy initialization. Eliminate LLMainLoopRepeater, which is completely unreferenced. Any potential future use cases are better addressed by posting to the main loop's WorkQueue. Eliminate llappviewer.cpp's private LLDeferredTaskList class, which implemented LLAppViewer::addOnIdleCallback(). Make addOnIdleCallback() post work to the main loop's WorkQueue instead.
2021-10-22Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
# Conflicts: # autobuild.xml # indra/CMakeLists.txt # indra/llcommon/CMakeLists.txt # indra/newview/CMakeLists.txt # indra/newview/llappviewerwin32.h
2021-10-13Merge with master after latest Viewer releaseCallum Linden
2021-10-14Merge branch master (DRTVWR-520) into DRTVWR-542-meshoptAndrey Kleshchev
2021-10-13Merge with head of Master after a new Viewer releaseCallum Prentice
2021-09-09SL-14541 remove mac-crash-loggerAndrey Kleshchev
2021-09-08SL-15211 SL-14541 Update OpenSSL libraryAndrey Kleshchev
Moving a copy of OpenSSL 1.1.1 to D543 from D520 to have less conflicts with zlib-ng integration later
2021-09-08SL-14541 Replace zlib with zlib-ngAndrey Kleshchev
2021-09-08SL-14541 removed breakpad, win_crash_loggerAndrey Kleshchev
# Conflicts: # autobuild.xml # indra/CMakeLists.txt # indra/newview/CMakeLists.txt # indra/newview/llappviewerwin32.h # indra/win_crash_logger/llcrashloggerwindows.cpp Cherry picked from DRTVWR-520
2021-09-03SL-15595 update viewer autobuild to import tracy libDave Houlton
2021-09-03DRTVWR-528 remove wrapper code for RAD telemetry libraryDave Houlton
2021-08-20DRTVWR-534: Batch of modifications to 360 capture project after moving from ↵Callum Prentice
internal repo to public one.
2021-08-12Merge branch 'master' into DRTVWR-520-apple-notarizationAndrey Lihatskiy
# Conflicts: # autobuild.xml # build.sh # indra/CMakeLists.txt # indra/newview/CMakeLists.txt # indra/newview/llappviewermacosx.cpp # indra/newview/llappviewerwin32.h # indra/newview/viewer_manifest.py # indra/win_crash_logger/llcrashloggerwindows.cpp
2021-07-20Merge master (DRTVWR-516) into DRTVWR-542-meshoptAndrey Kleshchev
2021-07-19Merge with tip of Master after a Viewer releaseCallum Prentice
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-25 14:12:40 +0000