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.

1b827077

Commit 1b827077 authored 14 years ago by Xiaohong Bao

Downloads
- Plain Diff

Automated merge with ssh://hg.lindenlab.com/q/viewer-trunk

parents 0516ef21 66a44529

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

indra/llcommon/llerror.cpp 16 additions, 0 deletions

indra/llcommon/llerror.cpp
indra/llplugin/llpluginclassmedia.cpp 4 additions, 0 deletions

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

indra/llplugin/llpluginclassmedia.h
indra/newview/llappviewer.cpp 1 addition, 8 deletions

indra/newview/llappviewer.cpp
indra/newview/llviewerdisplay.cpp 0 additions, 1 deletion

indra/newview/llviewerdisplay.cpp
indra/newview/llviewermedia.cpp 2 additions, 1 deletion

indra/newview/llviewermedia.cpp
indra/newview/pipeline.cpp 11 additions, 13 deletions

indra/newview/pipeline.cpp

with 42 additions and 23 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