summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2022-05-06Merged in brad/SL-17116-material-messaging (pull request #973)Brad Kittenbrink
brad/SL-17198 material assets Approved-by: Euclid Linden
2022-05-06SL-17198 more fixes to get material asset serialization working betterBrad Kittenbrink
2022-05-06SL-17198 fixes to get material asset serialization working betterBrad Kittenbrink
2022-05-06Merged in SL-17274 (pull request #964)Michael Pohoreski
SL-17274: Stub for PBR DrawPool and shader Approved-by: Euclid Linden Approved-by: Dave Parks
2022-05-06SL-17274: Add debug rendering to pbr shaderPtolemy
2022-05-06SL-17274: Add vary_position, cleanup whitespacePtolemy
2022-05-06SL-17274: Fix diffuse color not being used in pbr shaderPtolemy
2022-05-06Merge remote-tracking branch 'origin/DRTVWR-559' into ↵Brad Kittenbrink
brad/SL-17116-material-messaging
2022-05-06SL-17198 material asset uploading now suuceeeds.Brad Kittenbrink (Brad Linden)
2022-05-06SL-17356 Viewer changes for Premium Plus supportAndrey Lihatskiy
2022-05-05SL-17325 apply inventory material to faceDave Houlton
2022-05-05SL-17244 Fix 'empty leaf' crashesAndrey Kleshchev
2022-05-04Merge remote-tracking branch 'origin/master' into DRTVWR-559Brad Kittenbrink
2022-05-04Merge branch master (D550) into DRTVWR-546Andrey Kleshchev
# Conflicts: # indra/newview/llappviewer.h
2022-05-04SL-17283 LLReflectionMapManager prototype. Remove snapshot code related ↵Dave Parks
overhead from reflection map renders. Add parallax correction and support for multiple reflection maps.
2022-05-04Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
2022-05-04Increment viewer version to 6.5.6Nat Goodspeed
following promotion of DRTVWR-550
2022-05-02SL-17274: Stub for PBR DrawPool and shaderPtolemy
2022-05-02SL-17321 Fix for some particle systems with custom blend functions not ↵Dave Parks
rendering.
2022-04-29Merge branch 'DRTVWR-559' into euclid-17277Dave Houlton
2022-04-29SL-17116, SL-17277 single-face material save onlyDave Houlton
2022-04-29SL-17124 switchContext and loadShaderFile crashesAndrey Kleshchev
- 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-29SL-17282 prototype mixing of reflection map into legacy materialsDave Parks
2022-04-28Merge remote-tracking branch 'origin/euclid-17277' into ↵Brad Kittenbrink
brad/SL-17116-material-messaging
2022-04-28Beginning viewer side work for SL-17198 new asset and inventory types for ↵Brad Kittenbrink
Materials
2022-04-28SL-16721 Crash at LLVOAvatar::idleUpdateMiscAndrey Kleshchev
2022-04-28Add a (broken) material upload handler fxnDave Houlton
2022-04-28SL-17281 environment map prototype (stupid slow and hacky, but provides a ↵Dave Parks
way to get a "real" environment map for shader development)
2022-04-28SL-17301 FIXED Friends are not showing in friendslistMnikolenko Productengine
2022-04-27Test UI for SL-17116. provide a debug interface to set a MaterialID for a faceBrad Kittenbrink
2022-04-27SL-17116 work on implementing MaterialID in ExtraParams of ObjectUpdate and ↵Brad Kittenbrink
related messages
2022-04-27Prototype a SaveMaterial buttonDave Houlton
2022-04-26SL-17276 Potential fix for crash on shutdown on mac.Dave Parks
2022-04-26SL-17086 Fix for bad lighting in upload preview render.Dave Parks
2022-04-25SL-17239 Override face bounding box with avatar bounding box for rigged ↵Dave Parks
meshes when calculating virtual size.
2022-04-25SL-17223 fix unit tests with new method stub implementationBrad Kittenbrink
2022-04-25SL-17236 For real this time, maintain legacy draw order of alpha rigged ↵Dave Parks
meshes, batching be damned.
2022-04-25Fix for SL-17223 save mfa_hash protected store immediately so it doesn't get ↵Brad Kittenbrink
lost in case of crash
2022-04-21SL-17040 Crash due to LLWord not existingAndrey Kleshchev
LLWord should persist till the end due to wide usage.
2022-04-21SL-17159 Crash initializing LLInstanceTrackerPrivateAndrey Kleshchev
2022-04-20SL-17246 Fix getSharedPrt typoMnikolenko Productengine
2022-04-20SL-17242 Use proper cap for setting pathfinding attributesMnikolenko Productengine
2022-04-19Restored SL-15400, it got lost in an automatic mergeAndrey Kleshchev
Pausing clouds should not pause water
2022-04-18Merge branch master (D540) into DRTVWR-546Andrey Kleshchev
# Conflicts: # indra/llcommon/llsdutil.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/lldrawpoolalpha.cpp # indra/newview/lldrawpoolwater.cpp
2022-04-18Merge remote-tracking branch 'origin/master' into DRTVWR-550-mfaBrad Kittenbrink
2022-04-18Merge branch 'master' into DRTVWR-543-maintAndrey Lihatskiy
2022-04-18Increment viewer version to 6.5.5Nat Goodspeed
following promotion of DRTVWR-540
2022-04-14Merge remote-tracking branch 'origin/sl-17218' into DRTVWR-543-maintAndrey Lihatskiy
2022-04-14SL-17218: Per NickyD review feedback, test LLFace::mNormals too.Nat Goodspeed
2022-04-14SL-17218: Update faulty test for null LLFace::mTangentsNat Goodspeed