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.

2db036ba

Commit 2db036ba authored 2 years ago by David Parks

Downloads
- Plain Diff

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

parents 25ede863 97b5f07e

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/llprimitive/llgltfloader.cpp 3 additions, 1 deletion

indra/llprimitive/llgltfloader.cpp
indra/llrender/llimagegl.cpp 42 additions, 35 deletions

indra/llrender/llimagegl.cpp
indra/llrender/llimagegl.h 3 additions, 0 deletions

indra/llrender/llimagegl.h
indra/newview/app_settings/shaders/class1/deferred/materialV.glsl 12 additions, 15 deletions

...wview/app_settings/shaders/class1/deferred/materialV.glsl
indra/newview/app_settings/shaders/class3/deferred/materialF.glsl 14 additions, 10 deletions

...wview/app_settings/shaders/class3/deferred/materialF.glsl
indra/newview/llmodelpreview.cpp 3 additions, 1 deletion

indra/newview/llmodelpreview.cpp
indra/newview/llvovolume.cpp 15 additions, 0 deletions

indra/newview/llvovolume.cpp

with 92 additions and 62 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