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
1470e82c89
Merged in lindenlab/viewer-release
2019-04-02 21:51:54 +03:00
0272c47e5a
Tweaked naming a bit, also white space.
...
Will wait for a response from @graham_linden regarding moving the sRGB conversion functions in llmath.h to llrender.
2019-03-29 11:57:45 -07:00
57d88a8a98
Gamma correction pass 2:
...
Make sure lights are in the correct color space.
Bonus: cache the sRGB color in setLightColor on point and spot lights. Frees up a pow and some multiplies on the CPU every frame.
2019-03-29 08:11:56 -07:00
3fa8b844c3
Fixing gamma correction in EEP Step 1:
...
Thou shall always read the sky cubemap as sRGB using hardware sampling.
2019-03-29 02:51:41 -07:00
e409c0492f
convert to an explicit USE_BUGSPLAT switch in cmake, revise LL_ERRS approach
2019-03-02 11:58:11 -05:00
26fae750ba
SL-10291 Replace apr_mutex with standard C++11 functionality
2019-01-14 22:04:44 +02:00
8f45250f64
Put back test diff from viewer-release that should be.
2019-03-13 16:43:50 -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
d7ad30a2d4
SL-10566 part the fourth
...
Fix water rendering causing distortion map update very frame.
Reduce binds in alpha draw pool for HUD atmo suppression (may regress HUD lighting weirdness).
Add ability to retrieve current user clip plane so it can be saved/restored around water map gen.
Leave render type masks as is after reflection map render to get detail filtering applied to distortion map again.
Re-enable occlusion in distortion map rendering.
2019-02-27 17:07:31 -08: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
493cf89fd5
SL-6306 Viewer freeze and crash on octree
2019-05-13 18:53:11 +03:00
65bf63c973
Merged in lindenlab/viewer-bear
2019-04-02 22:12:55 +03: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
f30d95ee5f
SL-915 - more on alignment for 32-bit
2018-06-08 14:19:46 +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
363f7f84a1
Validation fixes.
2018-06-07 10:24:29 -07:00
2a2046fd07
merge
2018-06-05 22:44:04 +01:00
1c62165a2b
SL-915 - removed no optimize pragmas
2018-06-05 20:35:48 +01:00
b269b53170
SL-915 - alignment/optimization changes
2018-06-05 19:54:30 +01:00
3fcf7a32ee
SL-915 - incremental updates to dynamic bounding box, setting to control detail.
2018-06-05 15:35:21 +01:00
Andrey Lihatskiy