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.

41a0dc22

Commit 41a0dc22 authored 3 years ago by Kitty Barnett

Downloads
- Plain Diff

Merge branch 'lindenlab/release' (6.4.22) into viewer/build

parents 59e4e751 a242edc9

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 7 additions, 7 deletions

autobuild.xml
indra/media_plugins/cef/media_plugin_cef.cpp 45 additions, 8 deletions

indra/media_plugins/cef/media_plugin_cef.cpp
indra/newview/VIEWER_VERSION.txt 1 addition, 1 deletion

indra/newview/VIEWER_VERSION.txt
indra/newview/app_settings/settings.xml 0 additions, 11 deletions

indra/newview/app_settings/settings.xml
indra/newview/llsechandler_basic.cpp 11 additions, 3 deletions

indra/newview/llsechandler_basic.cpp
indra/newview/llviewermedia.cpp 4 additions, 4 deletions

indra/newview/llviewermedia.cpp
indra/newview/skins/default/xui/en/panel_preferences_setup.xml 15 additions, 30 deletions

.../newview/skins/default/xui/en/panel_preferences_setup.xml
indra/newview/viewer_manifest.py 3 additions, 5 deletions

indra/newview/viewer_manifest.py

with 86 additions and 69 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