Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

XDG Integration
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

Silent mode is enabled

All outbound communications are blocked. Learn more.

a91c970e

Commit a91c970e authored 2 years ago by David Parks

Downloads
- Plain Diff

Merge branch 'DRTVWR-559' of github.com:secondlife/viewer into DRTVWR-559

parents 50c57b6b 17d3f378

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

indra/llprimitive/llgltfmaterial.cpp 6 additions, 6 deletions

indra/llprimitive/llgltfmaterial.cpp
indra/llprimitive/llgltfmaterial.h 2 additions, 2 deletions

indra/llprimitive/llgltfmaterial.h
indra/llprimitive/tests/llgltfmaterial_test.cpp 119 additions, 6 deletions

indra/llprimitive/tests/llgltfmaterial_test.cpp
indra/newview/app_settings/shaders/class1/deferred/shadowUtil.glsl 10 additions, 10 deletions

...view/app_settings/shaders/class1/deferred/shadowUtil.glsl
indra/newview/llmaterialeditor.cpp 15 additions, 0 deletions

indra/newview/llmaterialeditor.cpp
indra/newview/lltexturectrl.cpp 7 additions, 5 deletions

indra/newview/lltexturectrl.cpp

with 159 additions and 29 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment