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.

718bd55f

Commit 718bd55f authored 5 years ago by AndreyL ProductEngine

Downloads
- Plain Diff

Downstream merge from lindenlab/viewer-serval

parents d1411e43 0ff935ca

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

indra/llplugin/llpluginclassmedia.cpp 3 additions, 1 deletion

indra/llplugin/llpluginclassmedia.cpp
indra/llplugin/llpluginclassmedia.h 1 addition, 1 deletion

indra/llplugin/llpluginclassmedia.h
indra/newview/llmediactrl.cpp 4 additions, 1 deletion

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

indra/newview/llpanelprimmediacontrols.cpp
indra/newview/llviewermedia.cpp 2 additions, 2 deletions

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

indra/newview/llviewermedia.h
indra/newview/llviewermediafocus.cpp 1 addition, 6 deletions

indra/newview/llviewermediafocus.cpp

with 20 additions and 20 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