076a895062
SL-17635 remove unused variables
2022-06-21 17:55:29 +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
3fcf7a32ee
SL-915 - incremental updates to dynamic bounding box, setting to control detail.
2018-06-05 15:35:21 +01:00
37e8fd20c3
Merge to 5.1.6
2018-06-01 15:34:21 +01:00
439273c9c1
Merge
2018-05-23 01:16:12 +01:00
64b3473f49
Merged in lindenlab/viewer-release
2018-05-18 03:02:44 +03:00
0d7fa932d5
Move class3 sky/cloud shaders to where they need to be to get picked up by ALM.
...
Modify autobuild.xml to use new libatmo w/ state save/restore fixes (addresses font render glitch).
Put in nSight debug support.
2018-04-20 18:14:29 +01:00
7a006ea3a2
merge
2018-05-18 18:40:36 +01:00
9f8c6ace4a
merge
2018-03-02 13:00:18 +00:00
af9069edbf
Merged in lindenlab/viewer-release
2018-03-02 00:47:08 +02:00
3f9b3e01b9
MAINT-8264 - prevent at least some cases of LODs getting stuck at too-low values.
2018-02-21 22:02:34 +00:00
0d40ac2ed9
MAINT-8258 Don't show sculpty until it is loaded or load fails
2018-02-07 20:41:53 +02:00
bdc9a93bc9
MAINT-8269 Crahes in cacheOptimize()
2018-02-05 16:52:13 +02:00
e36745eb98
merge
2018-01-17 16:06:27 +00:00
3b4ae3fe52
MAINT-8269 Crahes in cacheOptimize()
2018-02-05 16:52:13 +02:00
57a99273ed
Merged in lindenlab/viewer-release
2018-01-17 03:20:12 +02:00
c56298d4ba
MAINT-8022 Make unzip silent yet include failure reason into output
2018-01-03 16:30:57 +02:00
5c7f27562d
merge
2017-11-29 23:40:12 +00:00
e3a2c5e321
DRTVWR-418: Merge from latest viewer-release
2017-11-29 14:47:09 -05:00
fec6bbddc3
MAINT-7974 Fixed LLProfile crash(error) caused by thread unsafe variable
2017-11-03 20:30:47 +02:00
0c7bc67814
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
2017-10-11 14:35:49 -04:00
299592e88e
merge
2017-10-11 14:16:39 +01:00
Maxim Nikolenko