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.

0d576714

Commit 0d576714 authored 1 year ago by Rye Mutt

Downloads
- Plain Diff

Merge branch 'release/gltf-maint2' of https://github.com/secondlife/viewer

parents f1a37a09 3b9a1a44

No related branches found

No related tags found

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

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

doc/testplans/optimize_away_alpha.md 5 additions, 0 deletions

doc/testplans/optimize_away_alpha.md
indra/llcommon/indra_constants.cpp 6 additions, 0 deletions

indra/llcommon/indra_constants.cpp
indra/llcommon/indra_constants.h 5 additions, 0 deletions

indra/llcommon/indra_constants.h
indra/newview/app_settings/settings.xml 0 additions, 55 deletions

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

indra/newview/app_settings/settings_alchemy.xml
indra/newview/llfloaterenvironmentadjust.cpp 1 addition, 1 deletion

indra/newview/llfloaterenvironmentadjust.cpp
indra/newview/llmaterialeditor.cpp 1 addition, 3 deletions

indra/newview/llmaterialeditor.cpp
indra/newview/llpaneleditwater.cpp 1 addition, 1 deletion

indra/newview/llpaneleditwater.cpp
indra/newview/llpanelface.cpp 6 additions, 6 deletions

indra/newview/llpanelface.cpp
indra/newview/lltexturectrl.cpp 8 additions, 8 deletions

indra/newview/lltexturectrl.cpp
indra/newview/llviewertexturelist.cpp 11 additions, 2 deletions

indra/newview/llviewertexturelist.cpp

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