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.

885c56a6

Commit 885c56a6 authored 5 years ago by AndreyL ProductEngine

Downloads
- Plain Diff

Downstream merge from lindenlab/viewer-bear

parents 9666a96e 35d3901b

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

.hgtags 1 addition, 0 deletions

.hgtags
autobuild.xml 12 additions, 12 deletions

autobuild.xml
indra/llplugin/llpluginclassmedia.cpp 3 additions, 7 deletions

indra/llplugin/llpluginclassmedia.cpp
indra/llplugin/llpluginclassmedia.h 2 additions, 2 deletions

indra/llplugin/llpluginclassmedia.h
indra/media_plugins/cef/media_plugin_cef.cpp 6 additions, 13 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/llmediactrl.cpp 1 addition, 4 deletions

indra/newview/llmediactrl.cpp
indra/newview/llpanelprimmediacontrols.cpp 8 additions, 8 deletions

indra/newview/llpanelprimmediacontrols.cpp
indra/newview/llviewermedia.cpp 8 additions, 7 deletions

indra/newview/llviewermedia.cpp
indra/newview/llviewermedia.h 1 addition, 1 deletion

indra/newview/llviewermedia.h
indra/newview/llviewermediafocus.cpp 6 additions, 1 deletion

indra/newview/llviewermediafocus.cpp

with 49 additions and 56 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