5217e6bfb7
Merge branch 'main' into DRTVWR-577-maint-S
...
# Conflicts:
# indra/cmake/CMakeLists.txt
# indra/newview/skins/default/xui/es/floater_tools.xml
2023-03-30 00:25:16 +03:00
dca3c83cd9
Merge branch 'DRTVWR-568' into DRTVWR-573-maint-R
...
# 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-03-20 01:23:16 +02:00
6c54c9f8a9
Merge branch 'main' into DRTVWR-577-maint-S
...
# Conflicts:
# indra/llcommon/llsdserialize.cpp
# indra/llcommon/llsdserialize.h
# indra/newview/llfilepicker.h
# indra/newview/llfilepicker_mac.h
# indra/newview/llfilepicker_mac.mm
2023-02-09 22:33:52 +02:00
f7838ca17c
Merge branch 'main' into DRTVWR-568
2022-12-12 11:13:10 -08:00
f836194516
Merge branch 'main' into DRTVWR-570-maint-Q
...
# Conflicts:
# doc/contributions.txt
# indra/newview/app_settings/shaders/class1/deferred/materialF.glsl
# indra/newview/llfloater360capture.cpp
2022-12-12 20:53:11 +02:00
12f66fda13
DRTVWR-565: Merge branch 'origin/contribute' into DRTVWR-565
2022-12-12 13:27:57 -05:00
5a74f7648a
DRTVWR-575: A few more tweaks addressing size_t wider than 32 bits.
2022-11-03 15:18:32 -04:00
80585d56fd
Merge master into DRTVWR-568 (and fix conflicts)
2022-10-24 17:48:16 -07:00
e0ace0c722
Merge branch 'master' into DRTVWR-570-maint-Q
...
# Conflicts:
# indra/newview/llnetmap.cpp
# indra/newview/llnetmap.h
2022-10-20 22:34:11 +03:00
97b676b60f
Merge branch 'master' into DRTVWR-565-maint-P
2022-10-20 21:43:54 +03:00
1b31ab5c52
Introduce a U8* based interface to unzip_llsd and unpackVolumeFaces
2022-09-27 17:59:21 -04:00
0710d95f4b
Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into DRTVWR-568_cmake
2022-09-16 23:15:49 +02:00
f08f20db5f
Merge branch 'master' into DRTVWR-568
2022-09-15 17:00:34 -07:00
329268c5f7
Merge branch 'master' into DRTVWR-548-maint-N
...
# Conflicts:
# indra/newview/llmodelpreview.h
2022-09-15 20:44:04 +03:00
b5861e58cb
Merge branch 'master' into DRTVWR-565-maint-P
2022-09-15 20:43:02 +03:00
65612700f3
DRTVWR-558: Eliminate many spurious set-not-used variables.
...
With Xcode 13.4, these unused variables break Release builds.
2022-08-24 14:00:16 -04:00
09400b74ad
SL-17902 Crash at LLAlignedArray, out of bounds
2022-08-04 22:14:08 +03:00
59ab8e78f4
Merge branch 'master' into DRTVWR-544-maint
...
# Conflicts:
# indra/newview/llpanelface.cpp
# indra/newview/llpanelface.h
# indra/newview/llpanelobject.cpp
2022-08-04 00:17:55 +03:00
ea26ee5e92
Merge branch 'master' into DRTVWR-548-maint-N
...
# Conflicts:
# indra/newview/llfloaterworldmap.cpp
# indra/newview/llvovolume.cpp
2022-08-04 00:15:36 +03:00
dfc1175546
Merge branch 'master' into DRTVWR-565-maint-P
2022-08-04 00:12:26 +03:00
cdff716908
SL-17801: Don't let external code delete the raw pointer to the picking octree
2022-07-26 10:40:19 -07:00
f1128da8da
SL-17801: Use raw array for mOctreeTriangles to avoid memory alignment issues, increasing risk of crashes during picking due to SIMD operations
2022-07-26 10:40:19 -07:00
4ef83bb8bd
SL-17801: Add various safeguards to keep triangle indices count valid
2022-07-21 15:19:00 -07:00
f4e6ccc2c4
SL-17796 Crash at LLVolumeFace::getVertexData
2022-07-19 21:08:51 +03:00
a330095650
SL-16793 Potential crash at createSide
2022-07-07 00:01:33 +03:00
c01388fb0b
SL-16793 Crash at LLProfile::addHole
...
addHole can be accessed from main tread and from mesh thread, safeguard pt
2022-07-06 21:24:25 +03:00
162280cd98
SL-17021: Templatize LLOctreeNode and related classes to allow for option to store elements in octrees as raw pointers. Use for faster allocation in LLVolumeFace::createOctree.
2022-06-21 12:33:32 -07:00
dbe0cb5865
SL-17021: Clean up some unneeded member variables from lloctree
...
No performance difference measured
2022-06-21 12:33:32 -07:00
076a895062
SL-17635 remove unused variables
2022-06-21 17:55:29 +03:00
f451672b0c
SL-17475 Fix wrong remap buffer size
2022-06-16 16:46:04 +03:00
b1cbf369cf
SL-17475 Use a shadow indices buffer before simplification
2022-06-14 21:41:27 +03:00
45bcefd981
SL-17475 fix remap causing an assert
2022-06-14 16:40:56 +03:00
b08340f183
SL-17475 Remap models before simplification
2022-06-11 10:23:46 +03:00
95d5938eef
Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into DRTVWR-543-maint_cmake
2022-06-05 14:27:28 +02:00
43517c5adc
SL-17244 Fix 'empty leaf' crashes
2022-05-05 19:41:56 +03:00
283c2a20cc
Remove setting of HEADER_FILE_ONLY on .h* files, cmake automatically
...
sets the property on those.
2022-05-01 00:38:40 +02:00
ce4c694b66
Merge branch master (D540) into DRTVWR-546
...
# Conflicts:
# indra/llcommon/llsdutil.cpp
# indra/newview/VIEWER_VERSION.txt
# indra/newview/lldrawpoolalpha.cpp
# indra/newview/lldrawpoolwater.cpp
2022-04-18 23:42:39 +03:00
ca839307f9
Merge remote-tracking branch 'origin/DRTVWR-543-maint' into DRTVWR-543-maint_cmake
2022-04-18 19:57:34 +02:00
51e5437721
Use correct namespace for bind, must be phoenix::bind or there is confusion with boost::bind
2022-04-18 17:00:35 +02:00
e0cf0cdfd4
Switch to target_include_directories
...
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-17 18:04:57 +02:00
924fa0fa78
create target ll::uilibraries to have one common target that defines what each
...
operation system needs as dependencies on OS gui libraries.
2022-04-16 17:28:26 +02:00
d1b6a52fef
Googlemock target
2022-04-06 23:33:06 +02:00
786b291d9c
Move CMake files to modernized cmake syntax, step 1.
...
Change projects to cmake targetsto get rid of havig to hardcore
include directories and link libraries in consumer projects.
2022-04-06 16:32:52 +02:00
97a103255e
Merge branch 'master' (DRTVWR-557) into DRTVWR-546
...
# 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-03-01 13:41:42 +02:00
73eec89131
Merge branch 'master' into DRTVWR-540-maint
...
# Conflicts:
# autobuild.xml
# indra/llcommon/llsys.cpp
# indra/newview/app_settings/key_bindings.xml
# indra/newview/llfloatereditextdaycycle.cpp
2022-02-28 21:54:21 +02:00
f47730b92c
SL-16418 Media texture update stall fix. Make media texture updates use LLImageGL thread to update, fix AMD sync issue on ImageGL thread and install debug callbacks on LLImageGL thread when debug gl enabled.
2022-02-14 18:07:24 +00:00
1dde66ca79
SL-16607: Cleanup whitespace
2022-01-14 12:24:21 -08:00
9b5f6c636b
SL-16607: Add Tracy capture colors for insert, remove, and balance
2022-01-14 12:24:21 -08:00
1566c01ad1
SL-16607: Cleanup magic number for no child nodes
2022-01-14 12:24:21 -08:00
a71f772cc3
SL-16606: Add profiler category VOLUME
2022-01-14 11:50:21 -08:00
Andrey Lihatskiy