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.

cdd4bb40

Commit cdd4bb40 authored 1 year ago by Rye Mutt

Downloads
- Plain Diff

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

parents 9325e1ef d6b99cff

No related branches found

No related tags found

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

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

indra/llinventory/llsettingssky.cpp 4 additions, 1 deletion

indra/llinventory/llsettingssky.cpp
indra/newview/app_settings/shaders/class1/environment/srgbF.glsl 0 additions, 5 deletions

...ewview/app_settings/shaders/class1/environment/srgbF.glsl
indra/newview/app_settings/shaders/class3/deferred/materialF.glsl 2 additions, 1 deletion

...wview/app_settings/shaders/class3/deferred/materialF.glsl
indra/newview/app_settings/shaders/class3/deferred/reflectionProbeF.glsl 2 additions, 0 deletions

...pp_settings/shaders/class3/deferred/reflectionProbeF.glsl
indra/newview/lldrawpoolwlsky.cpp 5 additions, 0 deletions

indra/newview/lldrawpoolwlsky.cpp
indra/newview/llenvironment.cpp 11 additions, 3 deletions

indra/newview/llenvironment.cpp
indra/newview/llsettingsvo.cpp 14 additions, 2 deletions

indra/newview/llsettingsvo.cpp
indra/newview/llviewermenu.cpp 3 additions, 0 deletions

indra/newview/llviewermenu.cpp

with 41 additions and 12 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