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.

5b6e4577

Commit 5b6e4577 authored 15 years ago by Rick Pasetto

Downloads
- Plain Diff

Automated merge with ssh://rick@hg.lindenlab.com/skolb/media

parents 962a42a3 da3ca7c5

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

indra/newview/llmediadataclient.cpp 1 addition, 1 deletion

indra/newview/llmediadataclient.cpp
indra/newview/lltoolpie.cpp 3 additions, 5 deletions

indra/newview/lltoolpie.cpp
indra/newview/llviewermedia.cpp 14 additions, 0 deletions

indra/newview/llviewermedia.cpp
indra/newview/llviewermedia.h 2 additions, 0 deletions

indra/newview/llviewermedia.h
indra/newview/llviewermediafocus.cpp 13 additions, 3 deletions

indra/newview/llviewermediafocus.cpp
indra/newview/llvovolume.cpp 5 additions, 2 deletions

indra/newview/llvovolume.cpp

with 38 additions and 11 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