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.

027dbc2c

Commit 027dbc2c authored 2 years ago by Andrey Lihatskiy

Downloads
- Plain Diff

Merge branch 'DRTVWR-543-maint' into DRTVWR-543-maint_cmake

parents 32058405 a426e8dd

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

autobuild.xml 0 additions, 66 deletions

autobuild.xml
indra/llrender/llgl.cpp 23 additions, 28 deletions

indra/llrender/llgl.cpp
indra/newview/llappviewer.cpp 1 addition, 1 deletion

indra/newview/llappviewer.cpp
indra/newview/llface.cpp 0 additions, 1 deletion

indra/newview/llface.cpp
indra/newview/llflexibleobject.cpp 1 addition, 4 deletions

indra/newview/llflexibleobject.cpp
indra/newview/llvovolume.cpp 0 additions, 5 deletions

indra/newview/llvovolume.cpp

with 25 additions and 105 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