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.

832c1970

Commit 832c1970 authored 4 years ago by Andrey Lihatskiy

Downloads
- Plain Diff

Merge branch 'master' into DRTVWR-513-maint

parents 90978393 89cde15f

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

autobuild.xml 5 additions, 5 deletions

autobuild.xml
indra/edit-me-to-trigger-new-build.txt 0 additions, 4 deletions

indra/edit-me-to-trigger-new-build.txt
indra/llmessage/llcoproceduremanager.cpp 21 additions, 5 deletions

indra/llmessage/llcoproceduremanager.cpp
indra/newview/VIEWER_VERSION.txt 1 addition, 1 deletion

indra/newview/VIEWER_VERSION.txt
indra/newview/llappviewer.cpp 9 additions, 2 deletions

indra/newview/llappviewer.cpp
indra/newview/llstartup.cpp 2 additions, 18 deletions

indra/newview/llstartup.cpp
indra/newview/llviewerassetstorage.cpp 12 additions, 1 deletion

indra/newview/llviewerassetstorage.cpp
indra/newview/llviewerassetstorage.h 2 additions, 0 deletions

indra/newview/llviewerassetstorage.h

with 52 additions and 36 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