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.

57b371ab

Commit 57b371ab authored 12 years ago by David Parks

Downloads
- Plain Diff

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

parents e280422d 7a820b88

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/llmaterial.h 4 additions, 2 deletions

indra/llprimitive/llmaterial.h
indra/llprimitive/lltextureentry.cpp 4 additions, 0 deletions

indra/llprimitive/lltextureentry.cpp
indra/newview/llpanelface.cpp 68 additions, 29 deletions

indra/newview/llpanelface.cpp
indra/newview/llviewerobject.cpp 13 additions, 3 deletions

indra/newview/llviewerobject.cpp
indra/newview/llvovolume.cpp 27 additions, 33 deletions

indra/newview/llvovolume.cpp
indra/newview/skins/default/xui/en/panel_tools_texture.xml 3 additions, 0 deletions

indra/newview/skins/default/xui/en/panel_tools_texture.xml

with 119 additions and 67 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