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.

ac0c9d9d

Commit ac0c9d9d authored 1 year ago by Rye Mutt

Downloads
- Plain Diff

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

parents 67e62b24 b3fb5a92

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/settings.xml 1 addition, 1 deletion

indra/newview/app_settings/settings.xml
indra/newview/app_settings/shaders/class1/deferred/moonF.glsl 3 additions, 0 deletions

...a/newview/app_settings/shaders/class1/deferred/moonF.glsl
indra/newview/app_settings/shaders/class1/deferred/moonV.glsl 2 additions, 1 deletion

...a/newview/app_settings/shaders/class1/deferred/moonV.glsl
indra/newview/llfloaterfixedenvironment.cpp 3 additions, 1 deletion

indra/newview/llfloaterfixedenvironment.cpp
indra/newview/llinventorybridge.cpp 11 additions, 18 deletions

indra/newview/llinventorybridge.cpp
indra/newview/llmaterialeditor.cpp 20 additions, 4 deletions

indra/newview/llmaterialeditor.cpp
indra/newview/skins/default/xui/en/menu_inventory.xml 292 additions, 268 deletions

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

with 332 additions and 293 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