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.

2fd0e6e8

Commit 2fd0e6e8 authored 12 years ago by Graham Madarasz (Graham Linden)

Downloads
- Patches
- Plain Diff

Merge viewer-cat and resolve conflict with alternate self

parent 69133ca4

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

indra/llrender/llrender.cpp 16 additions, 0 deletions

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

indra/llrender/llrender.h
indra/llrender/llrendertarget.cpp 6 additions, 0 deletions

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

indra/llrender/llrendertarget.h
indra/newview/app_settings/settings.xml 11 additions, 0 deletions

indra/newview/app_settings/settings.xml
indra/newview/app_settings/shaders/class1/deferred/avatarF.glsl 3 additions, 1 deletion

...newview/app_settings/shaders/class1/deferred/avatarF.glsl
indra/newview/lldrawpoolavatar.cpp 85 additions, 99 deletions

indra/newview/lldrawpoolavatar.cpp
indra/newview/lldrawpoolavatar.h 1 addition, 0 deletions

indra/newview/lldrawpoolavatar.h
indra/newview/lldrawpoolbump.cpp 2 additions, 2 deletions

indra/newview/lldrawpoolbump.cpp

with 126 additions and 102 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