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.

4ed6b951

Commit 4ed6b951 authored 15 years ago by Lynx Linden

Downloads
- Plain Diff

Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0

parents 0556c2c0 507ccd52

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

indra/llplugin/llpluginclassmedia.cpp 28 additions, 0 deletions

indra/llplugin/llpluginclassmedia.cpp
indra/llplugin/llpluginclassmedia.h 12 additions, 0 deletions

indra/llplugin/llpluginclassmedia.h
indra/media_plugins/webkit/media_plugin_webkit.cpp 1 addition, 0 deletions

indra/media_plugins/webkit/media_plugin_webkit.cpp
indra/newview/llfloaterabout.cpp 1 addition, 1 deletion

indra/newview/llfloaterabout.cpp
indra/newview/llmediactrl.cpp 30 additions, 15 deletions

indra/newview/llmediactrl.cpp
indra/newview/llmediactrl.h 0 additions, 1 deletion

indra/newview/llmediactrl.h

with 72 additions and 17 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