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.

bc4694e8

Commit bc4694e8 authored 2 years ago by David Parks

Downloads
- Plain Diff

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

parents 8d2ac419 07ada65d

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/llprimitive/llgltfmaterial.cpp 12 additions, 9 deletions

indra/llprimitive/llgltfmaterial.cpp
indra/llprimitive/llgltfmaterial.h 5 additions, 3 deletions

indra/llprimitive/llgltfmaterial.h
indra/newview/app_settings/shaders/class3/deferred/screenSpaceReflPostF.glsl 39 additions, 19 deletions

...ettings/shaders/class3/deferred/screenSpaceReflPostF.glsl
indra/newview/app_settings/shaders/class3/deferred/screenSpaceReflUtil.glsl 14 additions, 14 deletions

...settings/shaders/class3/deferred/screenSpaceReflUtil.glsl
indra/newview/llgltfmateriallist.cpp 40 additions, 1 deletion

indra/newview/llgltfmateriallist.cpp
indra/newview/llgltfmateriallist.h 5 additions, 0 deletions

indra/newview/llgltfmateriallist.h
indra/newview/llpanelface.cpp 182 additions, 149 deletions

indra/newview/llpanelface.cpp
indra/newview/llpanelface.h 9 additions, 0 deletions

indra/newview/llpanelface.h
indra/newview/llviewerregion.cpp 41 additions, 7 deletions

indra/newview/llviewerregion.cpp
indra/newview/llviewerregion.h 5 additions, 1 deletion

indra/newview/llviewerregion.h
indra/newview/llvocache.cpp 11 additions, 2 deletions

indra/newview/llvocache.cpp
indra/newview/llvocache.h 14 additions, 1 deletion

indra/newview/llvocache.h
indra/newview/pipeline.cpp 3 additions, 2 deletions

indra/newview/pipeline.cpp
indra/newview/skins/default/xui/en/panel_tools_texture.xml 79 additions, 12 deletions

indra/newview/skins/default/xui/en/panel_tools_texture.xml

with 459 additions and 220 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