Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

XDG Integration
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

Silent mode is enabled

All outbound communications are blocked. Learn more.

c591146b

Commit c591146b authored 10 years ago by davep

Downloads
- Plain Diff

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

parents 499f5aa9 4caa2746

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

indra/llrender/llglslshader.cpp 34 additions, 16 deletions

indra/llrender/llglslshader.cpp
indra/llrender/llglslshader.h 3 additions, 1 deletion

indra/llrender/llglslshader.h
indra/llrender/llrendertarget.cpp 1 addition, 0 deletions

indra/llrender/llrendertarget.cpp
indra/llrender/llshadermgr.cpp 5 additions, 1 deletion

indra/llrender/llshadermgr.cpp
indra/newview/llfeaturemanager.cpp 63 additions, 4 deletions

indra/newview/llfeaturemanager.cpp
indra/newview/llglsandbox.cpp 66 additions, 14 deletions

indra/newview/llglsandbox.cpp
indra/newview/llviewermenu.cpp 1 addition, 1 deletion

indra/newview/llviewermenu.cpp

with 173 additions and 37 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