Age | Commit message (Collapse) | Author | |
---|---|---|---|
2023-03-30 | Merge branch 'main' into DRTVWR-567 | Maxim Nikolenko | |
# Conflicts: # indra/newview/llinventoryfunctions.cpp # indra/newview/llpanelmaininventory.h # indra/newview/skins/default/xui/en/floater_inventory_item_properties.xml # indra/newview/skins/default/xui/en/sidepanel_item_info.xml | |||
2023-03-20 | Merge branch 'DRTVWR-568' into DRTVWR-573-maint-R | Andrey 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-03 | Merge branch 'xcode-14.1' into andreyk/SL-19134 | Andrey Kleshchev | |
# Conflicts: # indra/llcommon/llsdserialize.cpp # indra/llcommon/llsdserialize.h | |||
2022-12-12 | Merge branch 'main' into DRTVWR-568 | Callum Prentice | |
2022-12-12 | Merge branch 'main' into DRTVWR-570-maint-Q | Andrey Lihatskiy | |
# Conflicts: # doc/contributions.txt # indra/newview/app_settings/shaders/class1/deferred/materialF.glsl # indra/newview/llfloater360capture.cpp | |||
2022-11-03 | DRTVWR-575: A few more tweaks addressing size_t wider than 32 bits. | Nat Goodspeed | |
2022-10-24 | Merge master into DRTVWR-568 (and fix conflicts) | Callum Linden | |
2022-10-20 | Merge branch 'master' into DRTVWR-570-maint-Q | Andrey Lihatskiy | |
# Conflicts: # indra/newview/llnetmap.cpp # indra/newview/llnetmap.h | |||
2022-10-20 | Merge branch 'master' into DRTVWR-565-maint-P | Andrey Lihatskiy | |
2022-09-27 | Introduce a U8* based interface to unzip_llsd and unpackVolumeFaces | Rye Mutt | |
2022-09-16 | Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into ↵ | Nicky Dasmijn | |
DRTVWR-568_cmake | |||
2022-09-15 | Merge branch 'master' into DRTVWR-568 | Callum Linden | |
2022-09-15 | Merge branch 'master' into DRTVWR-548-maint-N | Andrey Lihatskiy | |
# Conflicts: # indra/newview/llmodelpreview.h | |||
2022-09-15 | Merge branch 'master' into DRTVWR-565-maint-P | Andrey Lihatskiy | |
2022-08-24 | DRTVWR-558: Eliminate many spurious set-not-used variables. | Nat Goodspeed | |
With Xcode 13.4, these unused variables break Release builds. | |||
2022-08-04 | SL-17902 Crash at LLAlignedArray, out of bounds | Andrey Kleshchev | |
2022-08-04 | Merge branch 'master' into DRTVWR-544-maint | Andrey Lihatskiy | |
# Conflicts: # indra/newview/llpanelface.cpp # indra/newview/llpanelface.h # indra/newview/llpanelobject.cpp | |||
2022-08-04 | Merge branch 'master' into DRTVWR-548-maint-N | Andrey Lihatskiy | |
# Conflicts: # indra/newview/llfloaterworldmap.cpp # indra/newview/llvovolume.cpp | |||
2022-08-04 | Merge branch 'master' into DRTVWR-565-maint-P | Andrey Lihatskiy | |
2022-07-26 | SL-17801: Don't let external code delete the raw pointer to the picking octree | Cosmic Linden | |
2022-07-26 | SL-17801: Use raw array for mOctreeTriangles to avoid memory alignment ↵ | Cosmic Linden | |
issues, increasing risk of crashes during picking due to SIMD operations | |||
2022-07-21 | SL-17801: Add various safeguards to keep triangle indices count valid | Cosmic Linden | |
2022-07-19 | SL-17796 Crash at LLVolumeFace::getVertexData | Andrey Kleshchev | |
2022-07-07 | SL-16793 Potential crash at createSide | Andrey Kleshchev | |
2022-07-06 | SL-16793 Crash at LLProfile::addHole | Andrey Kleshchev | |
addHole can be accessed from main tread and from mesh thread, safeguard pt | |||
2022-06-21 | SL-17021: Templatize LLOctreeNode and related classes to allow for option to ↵ | Cosmic Linden | |
store elements in octrees as raw pointers. Use for faster allocation in LLVolumeFace::createOctree. | |||
2022-06-21 | SL-17021: Clean up some unneeded member variables from lloctree | Cosmic Linden | |
No performance difference measured | |||
2022-06-21 | SL-17635 remove unused variables | Maxim Nikolenko | |
2022-06-16 | SL-17475 Fix wrong remap buffer size | Andrey Kleshchev | |
2022-06-14 | SL-17475 Use a shadow indices buffer before simplification | Andrey Kleshchev | |
2022-06-14 | SL-17475 fix remap causing an assert | Andrey Kleshchev | |
2022-06-11 | SL-17475 Remap models before simplification | Andrey Kleshchev | |
2022-06-05 | Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into ↵ | Nicky | |
DRTVWR-543-maint_cmake | |||
2022-05-05 | SL-17244 Fix 'empty leaf' crashes | Andrey Kleshchev | |
2022-05-01 | Remove setting of HEADER_FILE_ONLY on .h* files, cmake automatically | Nicky | |
sets the property on those. | |||
2022-04-18 | Merge branch master (D540) into DRTVWR-546 | Andrey Kleshchev | |
# Conflicts: # indra/llcommon/llsdutil.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/lldrawpoolalpha.cpp # indra/newview/lldrawpoolwater.cpp | |||
2022-04-18 | Merge remote-tracking branch 'origin/DRTVWR-543-maint' into ↵ | Nicky | |
DRTVWR-543-maint_cmake | |||
2022-04-18 | Use correct namespace for bind, must be phoenix::bind or there is confusion ↵ | Nicky | |
with boost::bind | |||
2022-04-17 | Switch to target_include_directories | Nicky | |
All 3Ps include dirs are treated as SYSTEM, this will stop compilers stop emitting warnings from those files and greatly helps having high warning levels and not being swamped by warnings that come from external libraries. | |||
2022-04-16 | create target ll::uilibraries to have one common target that defines what each | Nicky | |
operation system needs as dependencies on OS gui libraries. | |||
2022-04-06 | Googlemock target | Nicky | |
2022-04-06 | Move CMake files to modernized cmake syntax, step 1. | Nicky | |
Change projects to cmake targetsto get rid of havig to hardcore include directories and link libraries in consumer projects. | |||
2022-03-01 | Merge branch 'master' (DRTVWR-557) into DRTVWR-546 | Andrey 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-28 | Merge branch 'master' into DRTVWR-540-maint | Andrey Lihatskiy | |
# Conflicts: # autobuild.xml # indra/llcommon/llsys.cpp # indra/newview/app_settings/key_bindings.xml # indra/newview/llfloatereditextdaycycle.cpp | |||
2022-02-14 | SL-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-01-14 | SL-16607: Cleanup whitespace | Ptolemy | |
2022-01-14 | SL-16607: Add Tracy capture colors for insert, remove, and balance | Ptolemy | |
2022-01-14 | SL-16607: Cleanup magic number for no child nodes | Ptolemy | |
2022-01-14 | SL-16606: Add profiler category VOLUME | Ptolemy | |
2022-01-10 | Merge branch 'DRTVWR-530-maint' into DRTVWR-553-maint-mix-JK | Andrey Lihatskiy | |
# Conflicts: # indra/newview/app_settings/key_bindings.xml # indra/newview/llappviewer.cpp # indra/newview/llkeyconflict.cpp |