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.

251d3f89

Commit 251d3f89 authored 11 years ago by Oz Linden

Downloads
- Plain Diff

merge changes for latest integration repo

parents 8761c879 174eda3e

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

indra/newview/app_settings/shaders/class1/deferred/alphaF.glsl 4 additions, 8 deletions

.../newview/app_settings/shaders/class1/deferred/alphaF.glsl
indra/newview/app_settings/shaders/class1/deferred/alphaV.glsl 4 additions, 9 deletions

.../newview/app_settings/shaders/class1/deferred/alphaV.glsl
indra/newview/featuretable.txt 1 addition, 1 deletion

indra/newview/featuretable.txt
indra/newview/llpanelface.cpp 59 additions, 40 deletions

indra/newview/llpanelface.cpp
indra/newview/llvovolume.cpp 4 additions, 1 deletion

indra/newview/llvovolume.cpp

with 72 additions and 59 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