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.

1ab43e06

Commit 1ab43e06 authored 2 years ago by David Parks

Downloads
- Plain Diff

Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559

parents 69ee8337 c467d8f0

No related branches found

No related tags found

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

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

indra/newview/app_settings/shaders/class1/deferred/attachmentAlphaMaskShadowF.glsl 1 addition, 1 deletion

...s/shaders/class1/deferred/attachmentAlphaMaskShadowF.glsl
indra/newview/app_settings/shaders/class1/deferred/attachmentAlphaShadowF.glsl 2 additions, 2 deletions

...tings/shaders/class1/deferred/attachmentAlphaShadowF.glsl
indra/newview/app_settings/shaders/class1/deferred/attachmentAlphaShadowV.glsl 3 additions, 3 deletions

...tings/shaders/class1/deferred/attachmentAlphaShadowV.glsl
indra/newview/app_settings/shaders/class1/deferred/avatarAlphaMaskShadowF.glsl 3 additions, 3 deletions

...tings/shaders/class1/deferred/avatarAlphaMaskShadowF.glsl
indra/newview/app_settings/shaders/class1/deferred/avatarAlphaShadowF.glsl 2 additions, 2 deletions

..._settings/shaders/class1/deferred/avatarAlphaShadowF.glsl
indra/newview/app_settings/shaders/class1/deferred/avatarAlphaShadowV.glsl 3 additions, 3 deletions

..._settings/shaders/class1/deferred/avatarAlphaShadowV.glsl
indra/newview/llviewertexture.cpp 2 additions, 2 deletions

indra/newview/llviewertexture.cpp

with 16 additions and 16 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