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.

62d40c8d

Commit 62d40c8d authored 11 years ago by Xiaohong Bao

Downloads
- Plain Diff

Automated merge with http://bitbucket.org/lindenlab/viewer-interesting

parents e4cacda5 a9d22b0f

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/llagent.cpp 1 addition, 0 deletions

indra/newview/llagent.cpp
indra/newview/llvieweroctree.h 6 additions, 6 deletions

indra/newview/llvieweroctree.h
indra/newview/llviewerregion.cpp 4 additions, 8 deletions

indra/newview/llviewerregion.cpp
indra/newview/llvocache.cpp 5 additions, 0 deletions

indra/newview/llvocache.cpp
indra/newview/pipeline.cpp 60 additions, 1 deletion

indra/newview/pipeline.cpp
indra/newview/pipeline.h 1 addition, 0 deletions

indra/newview/pipeline.h

with 77 additions and 15 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