fb00bce81a
Merge branch 'xcode-14.1' into DRTVWR-489-emoji
2023-01-26 10:37:59 -08:00
5a74f7648a
DRTVWR-575: A few more tweaks addressing size_t wider than 32 bits.
2022-11-03 15:18:32 -04:00
97b676b60f
Merge branch 'master' into DRTVWR-565-maint-P
2022-10-20 21:43:54 +03: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
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
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
43517c5adc
SL-17244 Fix 'empty leaf' crashes
2022-05-05 19:41:56 +03: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
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
a71f772cc3
SL-16606: Add profiler category VOLUME
2022-01-14 11:50:21 -08:00
469ce7f7f6
Merge branch 'DRTVWR-530-maint' into DRTVWR-553-maint-mix-JK
...
# Conflicts:
# indra/newview/app_settings/key_bindings.xml
# indra/newview/llappviewer.cpp
# indra/newview/llkeyconflict.cpp
2022-01-10 23:51:52 +02:00
27e4e245d9
Merge branch 'DRTVWR-542-meshopt' into DRTVWR-546
2021-11-29 20:33:13 +02:00
a1349c14dd
SL-16413 Handle out of memory llface allocations
2021-11-25 00:00:29 +02:00
bfcb1f61a8
SL-16263 RaiseException in LLVolumeFace::createSide
2021-10-28 01:27:18 +03:00
fea2d7bacc
SL-16152 _Allocate failed
2021-10-08 01:32:48 +03:00
8e4907beee
SL-16014: Add Tracy markup for LLVolumeFace
2021-09-22 14:38:43 -07:00
8e725e74aa
DRTVWR-542 Attempt to simplify all faces of an object as a whole and split back into faces #2
2021-07-26 21:20:53 +03:00
8a64ded50f
SL-14119 Crash at LLVolumeFace::cacheOptimize
2020-10-14 11:48:07 +03:00
c757c29c95
Merge branch 'master' into DRTVWR-500
...
# Conflicts:
# indra/newview/pipeline.cpp
2020-04-20 21:23:34 +03:00
f61a5c4642
Merge viewer-release 6.3.6 into viewwer-eep repo
2019-12-16 12:47:19 -07:00
bc496f5f17
Downstream merge from lindenlab/viewer-lynx
2019-11-27 22:58:52 +02:00
3d88b2587d
SL-12322 addTriangle crash
2019-11-21 17:49:03 +02:00
1b4d5492c6
SL-11727 Fix build warnings
2019-10-23 16:37:15 +03:00
71af0a2a9e
Fix shutdown crash in teardown of joint heirarchy.
...
Ifdef'd code for potential skinning speed up to avoid lots of int<->float conversions (expensive and static for min space investment)
as updating rigged VBs shows up as a profiling bottleneck for Low rendering (where we actually use CPU skinning).
2019-08-06 14:41:55 -07:00
76128c4357
SL-10566 Use vector for some high-traffic, low-item count containers instead of list.
...
Provide method of storing joint indices sep from weight data for faster runtime processing.
2019-08-05 12:04:29 -07:00
d78ed764b5
Merge 6.1.2 LoveMeRender new hotness
2019-04-02 12:27:34 -07:00
898c9f4421
Mods to make merge with viewer-release have less whitespace-only change and fix diffs between EEP and VR.
2019-03-13 13:21:48 -07:00
c21396181b
Merged in lindenlab/viewer-release
2018-11-14 22:47:31 +02:00
1d022e86c8
Merge
2018-11-14 11:19:33 -08:00
0aa2e5b1a3
Replace cache hit info in tex fetch debug display.
...
Silence launcher warning for devs.
Work-around path gen deciding to gen NaNs for some flexi prims.
2018-06-28 19:30:19 +01:00
edf6795eda
SL-915, MAINT-8554 - cleanup/reorg, added encroachment fix info to DebugAnimatedObjects output
2018-06-13 21:49:24 +01:00
430f9420cf
SL-915 - more on dynamic extent tracking, possible fix for 32-bit crash issues
2018-06-07 22:18:15 +01:00
2a2046fd07
merge
2018-06-05 22:44:04 +01:00
Callum Prentice