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.

d1f713f3

Commit d1f713f3 authored 12 years ago by David Parks

Downloads
- Plain Diff

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

parents fafa2131 f964e51f

No related branches found

No related tags found

No related merge requests found

Changes 30

Hide whitespace changes

Inline Side-by-side

Showing

indra/newview/app_settings/shaders/class2/deferred/multiSpotLightF.glsl 1 addition, 3 deletions

...app_settings/shaders/class2/deferred/multiSpotLightF.glsl
indra/newview/app_settings/shaders/class2/deferred/spotLightF.glsl 1 addition, 3 deletions

...view/app_settings/shaders/class2/deferred/spotLightF.glsl
indra/newview/llspatialpartition.cpp 1 addition, 1 deletion

indra/newview/llspatialpartition.cpp
indra/newview/llviewerdisplay.cpp 13 additions, 0 deletions

indra/newview/llviewerdisplay.cpp
indra/newview/llviewermenu.cpp 12 additions, 1 deletion

indra/newview/llviewermenu.cpp
indra/newview/llviewershadermgr.cpp 5 additions, 0 deletions

indra/newview/llviewershadermgr.cpp
indra/newview/llvotree.cpp 0 additions, 126 deletions

indra/newview/llvotree.cpp
indra/newview/llvotree.h 1 addition, 4 deletions

indra/newview/llvotree.h
indra/newview/pipeline.cpp 3 additions, 0 deletions

indra/newview/pipeline.cpp
indra/newview/skins/default/xui/en/menu_viewer.xml 6 additions, 0 deletions

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

with 43 additions and 138 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