356817d2fc
SL-17198 fixes to get material asset serialization working better
2022-05-06 10:02:47 -07:00
af11b7fb9c
Merged in SL-17274 (pull request #964 )
...
SL-17274: Stub for PBR DrawPool and shader
Approved-by: Euclid Linden
Approved-by: Dave Parks
2022-05-06 16:49:44 +00:00
663e121f2f
SL-17274: Add debug rendering to pbr shader
2022-05-06 09:48:49 -07:00
415380b140
SL-17274: Add vary_position, cleanup whitespace
2022-05-06 09:47:03 -07:00
849e85dfd2
SL-17274: Fix diffuse color not being used in pbr shader
2022-05-06 09:44:23 -07:00
afe5d1f270
Merge remote-tracking branch 'origin/DRTVWR-559' into brad/SL-17116-material-messaging
2022-05-06 08:38:45 -07:00
c9be81a747
SL-17198 material asset uploading now suuceeeds.
2022-05-06 08:26:19 -07:00
8b74adc89b
Merged in euclid-17325 (pull request #968 )
...
SL-17325 apply inventory material to face
2022-05-05 21:39:20 +00:00
cce5fdca84
SL-17325 apply inventory material to face
2022-05-05 15:38:16 -06:00
43517c5adc
SL-17244 Fix 'empty leaf' crashes
2022-05-05 19:41:56 +03:00
fa26abf901
Fix mac build for SL-17283 reflections work
2022-05-04 15:32:34 -07:00
5ac6f13965
Merge remote-tracking branch 'origin/master' into DRTVWR-559
2022-05-04 14:47:52 -07:00
f3add82a4c
Merge branch master (D550) into DRTVWR-546
...
# Conflicts:
# indra/newview/llappviewer.h
2022-05-04 20:10:29 +03:00
93260cfeff
SL-17283 LLReflectionMapManager prototype. Remove snapshot code related overhead from reflection map renders. Add parallax correction and support for multiple reflection maps.
2022-05-04 16:07:50 +00:00
bc7e2fb7e7
Increment viewer version to 6.5.6
...
following promotion of DRTVWR-550
2022-05-04 11:37:24 -04:00
54919fa749
SL-17274: Stub for PBR DrawPool and shader
2022-05-02 10:16:54 -07:00
1a6eee4ea2
SL-17321 Fix for some particle systems with custom blend functions not rendering.
2022-05-02 11:52:45 -05:00
82311e4b44
Merge branch 'DRTVWR-559' into euclid-17277
2022-04-29 17:26:17 -06:00
f05e58715e
SL-17116, SL-17277 single-face material save only
2022-04-29 17:04:22 -06:00
da6f4204b7
SL-17124 make sure window thread wakes up to proces 'quit' message
2022-04-29 22:18:20 +03:00
0e0c156bd0
Merged in brad/SL-17116-material-messaging (pull request #958 )
...
brad/SL-17116 material messaging
Approved-by: Euclid Linden
2022-04-29 18:02:45 +00:00
904b16a0a7
SL-17124 switchContext and loadShaderFile crashes
...
- Do not try initializing shaders if requirements are not met or if window does not exist
- Warn user before closing window. Situation is unexpected, there is chance of more issues, like a freeze or a crash on close()
- mHasMultitexture is a solid requirement, if it is not present, we won't be able to run
2022-04-29 19:41:22 +03:00
93a0259666
SL-17282 prototype mixing of reflection map into legacy materials
2022-04-29 13:51:11 +00:00
cc04903379
Merge remote-tracking branch 'origin/euclid-17277' into brad/SL-17116-material-messaging
2022-04-28 14:05:49 -07:00
c9ef206e39
Beginning viewer side work for SL-17198 new asset and inventory types for Materials
2022-04-28 13:08:37 -07:00
ac0c9a7412
SL-16721 Crash at LLVOAvatar::idleUpdateMisc
2022-04-28 23:06:56 +03:00
b08742d0b3
Add a (broken) material upload handler fxn
2022-04-28 11:53:43 -06:00
deffbca3ee
SL-17281 environment map prototype (stupid slow and hacky, but provides a way to get a "real" environment map for shader development)
2022-04-28 15:51:31 +00:00
9c0ebc5469
SL-17301 FIXED Friends are not showing in friendslist
2022-04-28 11:39:58 +03:00
3f43553ea0
Test UI for SL-17116. provide a debug interface to set a MaterialID for a face
2022-04-27 14:55:06 -07:00
c9fbd9e2e8
SL-17116 work on implementing MaterialID in ExtraParams of ObjectUpdate and related messages
2022-04-27 14:48:25 -07:00
c4625d26e5
Prototype a SaveMaterial button
2022-04-27 12:18:30 -06:00
a3ffa9f006
Merge remote-tracking branch 'origin/DRTVWR-546' into DRTVWR-559
2022-04-27 10:27:48 -07:00
a00a569ac8
SL-17276 Potential fix for crash on shutdown on mac.
2022-04-26 16:38:47 -05:00
436544a51a
SL-17086 Fix for bad lighting in upload preview render.
2022-04-26 14:43:55 -05:00
bafa869c21
SL-17239 Override face bounding box with avatar bounding box for rigged meshes when calculating virtual size.
2022-04-25 15:58:07 -05:00
56a1bc850b
SL-17223 fix unit tests with new method stub implementation
2022-04-25 13:44:38 -07:00
55179387c7
SL-17236 For real this time, maintain legacy draw order of alpha rigged meshes, batching be damned.
2022-04-25 15:27:39 -05:00
372a04dd51
Fix for SL-17223 save mfa_hash protected store immediately so it doesn't get lost in case of crash
2022-04-25 12:35:07 -07:00
ffdc04f5d2
SL-17040 Crash due to LLWord not existing
...
LLWord should persist till the end due to wide usage.
2022-04-21 22:58:30 +03:00
cf7bc4406e
SL-17159 Crash initializing LLInstanceTrackerPrivate
2022-04-21 20:43:50 +03:00
e0c4304e4a
Restored SL-15400, it got lost in an automatic merge
...
Pausing clouds should not pause water
2022-04-19 21:15:58 +03:00
030d61ac58
Merged in D559-merge-6.5.5 (pull request #946 )
...
DRTVWR-559 merge up to 6.5.5
2022-04-18 22:19:14 +00: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
e9921e77b0
Merge remote-tracking branch 'origin/master' into DRTVWR-550-mfa
2022-04-18 13:29:25 -07:00
d031662435
Increment viewer version to 6.5.5
...
following promotion of DRTVWR-540
2022-04-18 13:25:21 -04:00
efb9df04c3
SL-16831 Don't wait for an updater on login failure unles it's the cause of failure
2022-04-15 20:53:21 +03:00
e33f23f58a
SL-17194 Impostor quality pass 2 (and fix for fully transparent rigged attachments rendering to depth buffer)
2022-04-11 20:06:33 -05:00
cb6e1ac4a8
Merge branch 'DRTVWR-546' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-546
2022-04-11 15:52:11 -05:00
1d057dbba2
SL-17173 Impostor quality pass.
2022-04-11 15:51:51 -05:00
Brad Kittenbrink