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.

4bd87bb4

Commit 4bd87bb4 authored 11 years ago by David Parks

Downloads
- Plain Diff

Automated merge with https://bitbucket.org/lindenlab/viewer-lion

parents ef7826a9 cacefaf2

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

indra/llmath/llvolume.cpp 19 additions, 11 deletions

indra/llmath/llvolume.cpp
indra/newview/llviewermenu.cpp 0 additions, 2 deletions

indra/newview/llviewermenu.cpp
indra/newview/llviewerpartsim.cpp 4 additions, 0 deletions

indra/newview/llviewerpartsim.cpp
indra/newview/llviewerpartsim.h 4 additions, 0 deletions

indra/newview/llviewerpartsim.h
indra/newview/llvopartgroup.cpp 13 additions, 8 deletions

indra/newview/llvopartgroup.cpp

with 40 additions and 21 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