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.

d2b74484

Commit d2b74484 authored 10 months ago by Rye Mutt

Downloads
- Plain Diff

Merge branch 'release/materials_featurette' of https://github.com/secondlife/viewer into next

parents 1de5993e ca5e89d7

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

indra/cmake/GLM.cmake 7 additions, 0 deletions

indra/cmake/GLM.cmake
indra/newview/app_settings/settings.xml 0 additions, 11 deletions

indra/newview/app_settings/settings.xml
indra/newview/featuretable.txt 4 additions, 3 deletions

indra/newview/featuretable.txt
indra/newview/featuretable_mac.txt 6 additions, 5 deletions

indra/newview/featuretable_mac.txt
indra/newview/llheroprobemanager.cpp 1 addition, 2 deletions

indra/newview/llheroprobemanager.cpp
indra/newview/llpanelvolume.cpp 19 additions, 5 deletions

indra/newview/llpanelvolume.cpp
indra/newview/llviewerregion.cpp 0 additions, 11 deletions

indra/newview/llviewerregion.cpp
indra/newview/llvovolume.cpp 7 additions, 0 deletions

indra/newview/llvovolume.cpp
indra/newview/pipeline.cpp 0 additions, 3 deletions

indra/newview/pipeline.cpp
indra/newview/pipeline.h 0 additions, 1 deletion

indra/newview/pipeline.h

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