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.

8671bfb9

Commit 8671bfb9 authored 15 years ago by Rick Pasetto

Downloads
- Plain Diff

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

parents d4e01315 6824800f

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

indra/llplugin/slplugin/slplugin.cpp 72 additions, 28 deletions

indra/llplugin/slplugin/slplugin.cpp
indra/llui/llprogressbar.cpp 5 additions, 4 deletions

indra/llui/llprogressbar.cpp
indra/newview/llpanelprimmediacontrols.cpp 39 additions, 32 deletions

indra/newview/llpanelprimmediacontrols.cpp
indra/newview/llpanelprimmediacontrols.h 8 additions, 0 deletions

indra/newview/llpanelprimmediacontrols.h
indra/newview/llviewermediafocus.cpp 0 additions, 9 deletions

indra/newview/llviewermediafocus.cpp
indra/newview/skins/default/xui/en/panel_prim_media_controls.xml 22 additions, 17 deletions

...ewview/skins/default/xui/en/panel_prim_media_controls.xml

with 146 additions and 90 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