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.

ceb35372

Commit ceb35372 authored 6 years ago by Nat Goodspeed

Downloads
- Plain Diff

Automated merge with https://bitbucket.org/oz_linden/viewer-release-cmake3.12

parents b51972ba cc376f86

No related branches found

No related tags found

No related merge requests found

Changes 12

Expand all Hide whitespace changes

Inline Side-by-side

Showing

autobuild.xml 6 additions, 182 deletions

autobuild.xml
indra/cmake/LLBase.cmake 0 additions, 4 deletions

indra/cmake/LLBase.cmake
indra/cmake/Requests.cmake 0 additions, 7 deletions

indra/cmake/Requests.cmake
indra/llvfs/lldir_mac.cpp 2 additions, 2 deletions

indra/llvfs/lldir_mac.cpp
indra/llwindow/llwindowmacosx.cpp 4 additions, 6 deletions

indra/llwindow/llwindowmacosx.cpp
indra/newview/CMakeLists.txt 1 addition, 9 deletions

indra/newview/CMakeLists.txt
indra/newview/Info-SecondLife.plist 1 addition, 1 deletion

indra/newview/Info-SecondLife.plist
indra/newview/installers/windows/installer_template.nsi 27 additions, 14 deletions

indra/newview/installers/windows/installer_template.nsi
indra/newview/llappviewer.cpp 17 additions, 20 deletions

indra/newview/llappviewer.cpp
indra/newview/llstartup.cpp 1 addition, 2 deletions

indra/newview/llstartup.cpp
indra/newview/llvoicevivox.cpp 4 additions, 5 deletions

indra/newview/llvoicevivox.cpp
indra/newview/viewer_manifest.py 295 additions, 395 deletions

indra/newview/viewer_manifest.py

with 358 additions and 647 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