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.

9a024172

Commit 9a024172 authored 2 years ago by David Parks

Downloads
- Plain Diff

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

parents 36f37ebf 4478decb

No related branches found

No related tags found

2 merge requests!3Update to main branch,!2Rebase onto current main branch

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

indra/llprimitive/llgltfmaterial.cpp 10 additions, 20 deletions

indra/llprimitive/llgltfmaterial.cpp
indra/llprimitive/llgltfmaterial.h 1 addition, 2 deletions

indra/llprimitive/llgltfmaterial.h
indra/llrender/llshadermgr.cpp 6 additions, 14 deletions

indra/llrender/llshadermgr.cpp
indra/llrender/llshadermgr.h 4 additions, 12 deletions

indra/llrender/llshadermgr.h
indra/newview/app_settings/shaders/class1/deferred/pbralphaV.glsl 14 additions, 26 deletions

...wview/app_settings/shaders/class1/deferred/pbralphaV.glsl
indra/newview/app_settings/shaders/class1/deferred/pbrglowV.glsl 5 additions, 9 deletions

...ewview/app_settings/shaders/class1/deferred/pbrglowV.glsl
indra/newview/app_settings/shaders/class1/deferred/pbropaqueV.glsl 16 additions, 32 deletions

...view/app_settings/shaders/class1/deferred/pbropaqueV.glsl
indra/newview/app_settings/shaders/class1/deferred/textureUtilV.glsl 2 additions, 2 deletions

...ew/app_settings/shaders/class1/deferred/textureUtilV.glsl
indra/newview/llfetchedgltfmaterial.cpp 12 additions, 12 deletions

indra/newview/llfetchedgltfmaterial.cpp

with 70 additions and 129 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