Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

Alchemy Viewer
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Releases
- Package registry
- Terraform modules

Snippets Groups Projects

Silent mode is enabled

All outbound communications are blocked. Learn more.

ec41285f

Commit ec41285f authored 11 months ago by Rye Mutt

Downloads
- Plain Diff

Merge branch 'main' into merge/materials_featurette

parents 76651f98 2c20148c

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

indra/newview/character/avatar_lad.xml 9 additions, 8 deletions

indra/newview/character/avatar_lad.xml
indra/newview/llscrollingpanelparam.cpp 44 additions, 19 deletions

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

indra/newview/llscrollingpanelparam.h
indra/newview/llscrollingpanelparambase.cpp 14 additions, 15 deletions

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

indra/newview/llscrollingpanelparambase.h

with 72 additions and 47 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