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.

cfe1100a

Commit cfe1100a authored 3 years ago by Rye Mutt

Downloads
- Plain Diff

Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into master

parents 307f176e c40b8310

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

autobuild.xml 7 additions, 7 deletions

autobuild.xml
indra/media_plugins/cef/media_plugin_cef.cpp 41 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/llviewermedia.cpp 4 additions, 4 deletions

indra/newview/llviewermedia.cpp
indra/newview/skins/default/xui/en/panel_preferences_setup.xml 0 additions, 14 deletions

.../newview/skins/default/xui/en/panel_preferences_setup.xml

with 53 additions and 45 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