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.

be1fd62e

Commit be1fd62e authored 1 year ago by Rye Mutt

Downloads
- Plain Diff

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

parents 4ce81cf3 ca47c7ff

No related branches found

No related tags found

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

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

indra/newview/app_settings/shaders/class1/objects/previewV.glsl 18 additions, 6 deletions

...newview/app_settings/shaders/class1/objects/previewV.glsl
indra/newview/featuretable.txt 5 additions, 5 deletions

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

indra/newview/featuretable_mac.txt
indra/newview/llmodelpreview.cpp 64 additions, 49 deletions

indra/newview/llmodelpreview.cpp
indra/newview/llreflectionmapmanager.cpp 4 additions, 0 deletions

indra/newview/llreflectionmapmanager.cpp
indra/newview/llviewershadermgr.cpp 4 additions, 8 deletions

indra/newview/llviewershadermgr.cpp
indra/newview/pipeline.cpp 8 additions, 2 deletions

indra/newview/pipeline.cpp

with 108 additions and 75 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