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.

a4397723

Commit a4397723 authored 2 years ago by Brad Linden

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/DRTVWR-559' into brad/DRTVWR-559

parents 43c0dc7f 0c2e7a8e

No related branches found

No related tags found

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

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

indra/newview/lldrawpoolalpha.cpp 1 addition, 2 deletions

indra/newview/lldrawpoolalpha.cpp
indra/newview/lldrawpoolwater.cpp 1 addition, 1 deletion

indra/newview/lldrawpoolwater.cpp
indra/newview/llviewertexture.cpp 13 additions, 3 deletions

indra/newview/llviewertexture.cpp
indra/newview/llviewertexture.h 4 additions, 1 deletion

indra/newview/llviewertexture.h

with 19 additions and 7 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