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.

ca847845

Commit ca847845 authored 9 years ago by callum_linden

Downloads
- Plain Diff

merge with head

parents abc9df45 f023f879

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

autobuild.xml 5 additions, 5 deletions

autobuild.xml
indra/llplugin/llpluginclassmedia.cpp 4 additions, 5 deletions

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

indra/llplugin/llpluginclassmedia.h
indra/llplugin/llpluginprocesschild.cpp 31 additions, 12 deletions

indra/llplugin/llpluginprocesschild.cpp
indra/llplugin/llpluginprocesschild.h 4 additions, 3 deletions

indra/llplugin/llpluginprocesschild.h
indra/llplugin/llpluginprocessparent.cpp 196 additions, 112 deletions

indra/llplugin/llpluginprocessparent.cpp
indra/llplugin/llpluginprocessparent.h 23 additions, 5 deletions

indra/llplugin/llpluginprocessparent.h
indra/media_plugins/cef/media_plugin_cef.cpp 2 additions, 0 deletions

indra/media_plugins/cef/media_plugin_cef.cpp
indra/newview/llappviewer.cpp 3 additions, 0 deletions

indra/newview/llappviewer.cpp
indra/newview/tests/llmediadataclient_test.cpp 1 addition, 1 deletion

indra/newview/tests/llmediadataclient_test.cpp

with 270 additions and 144 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