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.

6fdd35d5

Commit 6fdd35d5 authored 2 years ago by Nicky

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into DRTVWR-543-maint_cmake

parents 3f31d0b5 de017d08

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

indra/llwindow/llwindowwin32.cpp 14 additions, 2 deletions

indra/llwindow/llwindowwin32.cpp
indra/newview/VIEWER_VERSION.txt 1 addition, 1 deletion

indra/newview/VIEWER_VERSION.txt
indra/newview/llappviewer.cpp 7 additions, 1 deletion

indra/newview/llappviewer.cpp
indra/newview/llappviewer.h 1 addition, 0 deletions

indra/newview/llappviewer.h
indra/newview/lllogininstance.cpp 1 addition, 1 deletion

indra/newview/lllogininstance.cpp
indra/newview/pipeline.cpp 41 additions, 16 deletions

indra/newview/pipeline.cpp
indra/newview/tests/lllogininstance_test.cpp 1 addition, 0 deletions

indra/newview/tests/lllogininstance_test.cpp

with 66 additions and 21 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