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.

d7aa48c4

Commit d7aa48c4 authored 2 years ago by Rye Mutt

Downloads
- Plain Diff

Merge branch 'main' into cronchy

parents 2b193e61 adb30870

Branches

No related tags found

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

Changes 4

Show whitespace changes

Inline Side-by-side

Showing

indra/newview/llfloatersnapshot.cpp 21 additions, 26 deletions

indra/newview/llfloatersnapshot.cpp
indra/newview/llfloatersnapshot.h 0 additions, 5 deletions

indra/newview/llfloatersnapshot.h
indra/newview/llpanelsnapshot.cpp 19 additions, 16 deletions

indra/newview/llpanelsnapshot.cpp
indra/newview/llpanelsnapshot.h 0 additions, 3 deletions

indra/newview/llpanelsnapshot.h

with 40 additions and 50 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