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.

8c4fcd76

Commit 8c4fcd76 authored 1 year ago by David Parks

Downloads
- Plain Diff

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

parents ff447739 2e591ffb

No related branches found

No related tags found

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

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

indra/llappearance/llavatarappearance.cpp 0 additions, 1 deletion

indra/llappearance/llavatarappearance.cpp
indra/newview/lldrawpoolavatar.cpp 6 additions, 6 deletions

indra/newview/lldrawpoolavatar.cpp
indra/newview/llpanelface.cpp 28 additions, 11 deletions

indra/newview/llpanelface.cpp
indra/newview/llpanelface.h 2 additions, 2 deletions

indra/newview/llpanelface.h
indra/newview/lltexturectrl.cpp 18 additions, 5 deletions

indra/newview/lltexturectrl.cpp
indra/newview/lltexturectrl.h 1 addition, 0 deletions

indra/newview/lltexturectrl.h
indra/newview/llviewermenu.cpp 12 additions, 2 deletions

indra/newview/llviewermenu.cpp
indra/newview/llvieweroctree.cpp 5 additions, 1 deletion

indra/newview/llvieweroctree.cpp
indra/newview/llvoavatar.cpp 0 additions, 5 deletions

indra/newview/llvoavatar.cpp
indra/newview/pipeline.cpp 29 additions, 3 deletions

indra/newview/pipeline.cpp

with 101 additions and 36 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