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.

47b9f588

Commit 47b9f588 authored 13 years ago by Xiaohong Bao

Downloads
- Plain Diff

Automated merge with http://hg.secondlife.com/mesh-development

parents 8e532652 0bb7bcc9

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

indra/llprimitive/llmodel.cpp 1 addition, 1 deletion

indra/llprimitive/llmodel.cpp
indra/newview/llfloatermodelpreview.cpp 19 additions, 2 deletions

indra/newview/llfloatermodelpreview.cpp
indra/newview/llfloatermodelpreview.h 3 additions, 0 deletions

indra/newview/llfloatermodelpreview.h
indra/newview/llmeshrepository.cpp 10 additions, 11 deletions

indra/newview/llmeshrepository.cpp
indra/newview/llviewertexture.cpp 17 additions, 2 deletions

indra/newview/llviewertexture.cpp
indra/newview/llviewertexture.h 2 additions, 1 deletion

indra/newview/llviewertexture.h

with 52 additions and 17 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