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.

c00699c5

Commit c00699c5 authored 1 year ago by Rye Mutt

Downloads
- Plain Diff

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

parents c2a01f8f 53e958a2

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/llrender/llgltexture.cpp 3 additions, 2 deletions

indra/llrender/llgltexture.cpp
indra/llrender/llgltexture.h 1 addition, 0 deletions

indra/llrender/llgltexture.h
indra/newview/llinventorygallery.cpp 22 additions, 4 deletions

indra/newview/llinventorygallery.cpp
indra/newview/llinventorygallery.h 4 additions, 0 deletions

indra/newview/llinventorygallery.h
indra/newview/llthumbnailctrl.cpp 21 additions, 16 deletions

indra/newview/llthumbnailctrl.cpp
indra/newview/llthumbnailctrl.h 2 additions, 1 deletion

indra/newview/llthumbnailctrl.h
indra/newview/llviewertexture.cpp 67 additions, 12 deletions

indra/newview/llviewertexture.cpp
indra/newview/llviewertexturelist.cpp 8 additions, 5 deletions

indra/newview/llviewertexturelist.cpp

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