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.

afb7efbf

Commit afb7efbf authored 2 years ago by David Parks

Downloads
- Plain Diff

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

parents a0a87db3 5d918f98

No related branches found

No related tags found

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

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

indra/newview/app_settings/settings_per_account.xml 11 additions, 0 deletions

indra/newview/app_settings/settings_per_account.xml
indra/newview/llfloaterpreference.cpp 10 additions, 0 deletions

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

indra/newview/llfloaterpreference.h
indra/newview/llinventorymodel.cpp 5 additions, 0 deletions

indra/newview/llinventorymodel.cpp
indra/newview/llinventorypanel.cpp 4 additions, 0 deletions

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

indra/newview/llmaterialeditor.cpp
indra/newview/skins/default/xui/en/menu_inventory.xml 8 additions, 0 deletions

indra/newview/skins/default/xui/en/menu_inventory.xml
indra/newview/skins/default/xui/en/panel_preferences_uploads.xml 25 additions, 0 deletions

...ewview/skins/default/xui/en/panel_preferences_uploads.xml

with 65 additions and 1 deletion

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