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.

2456715a

Commit 2456715a authored 6 years ago by Rider Linden

Downloads
- Plain Diff

Merged in graham_linden/viewer-eep-fixes (pull request #253)

SL-10443, SL-9994, SL-10374, SL-10081

parents 29e8215f f1ee481b

No related branches found

No related tags found

No related merge requests found

Changes 14

Expand all Hide whitespace changes

Inline Side-by-side

Showing

indra/llrender/llshadermgr.cpp 2 additions, 1 deletion

indra/llrender/llshadermgr.cpp
indra/llrender/llshadermgr.h 1 addition, 0 deletions

indra/llrender/llshadermgr.h
indra/newview/app_settings/shaders/class1/deferred/aoUtil.glsl 32 additions, 2 deletions

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

...app_settings/shaders/class1/deferred/multiSpotLightF.glsl
indra/newview/app_settings/shaders/class1/deferred/shadowUtil.glsl 0 additions, 8 deletions

...view/app_settings/shaders/class1/deferred/shadowUtil.glsl
indra/newview/app_settings/shaders/class1/deferred/waterF.glsl 93 additions, 92 deletions

.../newview/app_settings/shaders/class1/deferred/waterF.glsl
indra/newview/app_settings/shaders/class1/environment/decodeNormF.glsl 0 additions, 36 deletions

.../app_settings/shaders/class1/environment/decodeNormF.glsl
indra/newview/app_settings/shaders/class1/environment/waterF.glsl 88 additions, 84 deletions

...wview/app_settings/shaders/class1/environment/waterF.glsl
indra/newview/lldrawpoolwater.cpp 149 additions, 104 deletions

indra/newview/lldrawpoolwater.cpp
indra/newview/lldrawpoolwater.h 2 additions, 0 deletions

indra/newview/lldrawpoolwater.h
indra/newview/llviewershadermgr.cpp 52 additions, 80 deletions

indra/newview/llviewershadermgr.cpp
indra/newview/llviewershadermgr.h 1 addition, 0 deletions

indra/newview/llviewershadermgr.h
indra/newview/llviewerwindow.cpp 0 additions, 5 deletions

indra/newview/llviewerwindow.cpp
indra/newview/llvosky.cpp 3 additions, 3 deletions

indra/newview/llvosky.cpp

with 424 additions and 416 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