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.

25b63769

Commit 25b63769 authored 1 year ago by Rye Mutt

Downloads
- Plain Diff

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

parents 6abb94ef d8e4572b

No related branches found

No related tags found

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

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

indra/newview/app_settings/logcontrol.xml 0 additions, 1 deletion

indra/newview/app_settings/logcontrol.xml
indra/newview/llfloaterbulkpermission.cpp 5 additions, 0 deletions

indra/newview/llfloaterbulkpermission.cpp
indra/newview/llfloaterbulkpermission.h 2 additions, 0 deletions

indra/newview/llfloaterbulkpermission.h
indra/newview/llpanelface.cpp 129 additions, 50 deletions

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

indra/newview/llpanelface.h
indra/newview/skins/default/xui/en/floater_bulk_perms.xml 14 additions, 0 deletions

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

with 152 additions and 56 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