8c0163bcb4
SL-17214 initial loader class skeleton
2022-06-08 13:33:59 -06: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
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
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
28f9fb06a9
SL-16289 Rigged mesh rendering overhaul
2021-11-20 18:49:19 +00:00
8d20480c5f
SL-16148 SL-16244 SL-16270 SL-16253 Remove most BlockTimers, remove LLMemTracked, introduce alignas, hook most/all reamining allocs, disable synchronous occlusion, and convert frequently accessed LLSingletons to LLSimpleton
2021-10-28 18:06:21 +00: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
60980a4733
Merge remote-tracking branch 'remotes/origin/DRTVWR-541' into DRTVWR-546
2021-09-22 18:06:58 -05:00
8e4907beee
SL-16014: Add Tracy markup for LLVolumeFace
2021-09-22 14:38:43 -07:00
f79890669d
SL-16006 and SL-16009 Rigged mesh rendering optimization pass
2021-09-20 18:58:09 +00:00
2d2ed85c56
DRTVWR-542 Fix malfunctioning warning
2021-07-28 22:19:43 +03: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
fef6c1f51e
Merge branch 'master' into DRTVWR-516-maint
2021-06-07 20:54:41 +03:00
fd1545197a
SL-10297: Merge branch 'sl-10297-oz' into sl-10297.
...
Bring in Oz's tweaks to the way BugSplat is engaged and tested, plus a few
other miscellaneous goodies.
2021-05-12 13:56:19 -04:00
f07b332ef0
Merge branch 'master' into DV525-merge-6.4.13
2021-02-01 15:59:08 -07:00
8a64ded50f
SL-14119 Crash at LLVolumeFace::cacheOptimize
2020-10-14 11:48:07 +03:00
7cd076c796
DRTVWR-510 remove all LL_SOLARIS conditionals
2020-10-08 17:16:22 -06:00
a9d271c5a2
SL-10297 merged 6.4.7
2020-08-24 13:11:07 -04:00
9406b757a3
Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
...
# Conflicts:
# indra/cmake/DirectX.cmake
# indra/newview/llviewerparcelmedia.cpp
# indra/newview/viewer_manifest.py
2020-08-11 01:34:13 +03:00
86009f885e
SL-10297: merge up to master at 6.4.3
2020-06-15 15:29:04 -04:00
ca6f092929
DRTVWR-476: Merge branch 'master' of lindenlab/viewer into DRTVWR-476-boost-1.72
2020-05-06 16:06:26 -04:00
ec9b989863
Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
...
# Conflicts:
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorypanel.cpp
# indra/newview/lltexturectrl.cpp
# indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml
# indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
2020-05-05 00:37:16 +03:00
c757c29c95
Merge branch 'master' into DRTVWR-500
...
# Conflicts:
# indra/newview/pipeline.cpp
2020-04-20 21:23:34 +03:00
f61474fe5b
DRTVWR-440, quick fix, add return value - needed for Mac build
2020-03-27 11:24:22 -06:00
d756e18573
SL-12902 Fix for doing the technically correct but compatibility wrong thing WRT light color values.
2020-03-26 16:48:33 -05:00
476721e48a
Backed out changeset: de49423bb5ae
2020-03-25 18:39:20 -04:00
8dff5a257f
Backed out changeset: 02ef251a64b5
2020-03-25 18:39:20 -04:00
3327447f95
[DRTVWR-476] - skip a math test
2020-03-25 18:39:20 -04:00
abfc78429f
SL-12179 Change LLVector4a to a struct
2020-02-04 16:10:04 +02: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
3609eabe54
Merge viewer-release 6.3.2
2019-09-10 12:07:01 -07: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
9118cafb22
SL-11327
...
Soften assert on non-finite data in LLCoordFrame until we can isolate conditions to repro the assert.
2019-05-30 12:59:51 -07:00
63ecb7325e
SL-11260 part deux
...
Tamp down more view-dependent refraction map fail.
2019-05-23 15:47:02 -07:00
470d1595cc
Merge viewer-release
2019-05-08 09:30:39 -07:00
d78ed764b5
Merge 6.1.2 LoveMeRender new hotness
2019-04-02 12:27:34 -07:00
Dave Houlton