Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

Alchemy Viewer
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Releases
- Package registry
- Terraform modules

Snippets Groups Projects

Silent mode is enabled

All outbound communications are blocked. Learn more.

8e4017c7

Commit 8e4017c7 authored 4 years ago by Kitty Barnett

Downloads
- Plain Diff

Merge branch 'lindenlab/release' into viewer/build

parents 4b317483 693791f4

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

indra/newview/app_settings/shaders/class2/deferred/softenLightV.glsl 9 additions, 0 deletions

...ew/app_settings/shaders/class2/deferred/softenLightV.glsl
indra/newview/app_settings/shaders/class2/windlight/atmosphericsVarsF.glsl 0 additions, 1 deletion

..._settings/shaders/class2/windlight/atmosphericsVarsF.glsl
indra/newview/llenvironment.cpp 0 additions, 2 deletions

indra/newview/llenvironment.cpp
indra/newview/llstartup.cpp 5 additions, 1 deletion

indra/newview/llstartup.cpp

with 14 additions and 4 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