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.

5a363165

Commit 5a363165 authored 2 years ago by David Parks

Downloads
- Plain Diff

Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559

parents 82ab5f97 c5dd5a0e

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/llinventory/llfoldertype.cpp 1 addition, 0 deletions

indra/llinventory/llfoldertype.cpp
indra/newview/llinventorypanel.cpp 1 addition, 0 deletions

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

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

indra/newview/llsettingsvo.cpp
indra/newview/lltexturectrl.cpp 2 additions, 0 deletions

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

indra/newview/llviewerfoldertype.cpp
indra/newview/skins/default/xui/en/strings.xml 2 additions, 0 deletions

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

with 9 additions and 2 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