Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

Alchemy Viewer
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

Silent mode is enabled

All outbound communications are blocked. Learn more.

377544c8

Commit 377544c8 authored 12 years ago by Nat Goodspeed

Downloads
- Plain Diff

merge changes for MAINT-1955, MAINT-1958

parents cc2c426e 5a938e3a

No related branches found

No related tags found

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

.hgtags 2 additions, 0 deletions

.hgtags
indra/llrender/llrendertarget.cpp 17 additions, 17 deletions

indra/llrender/llrendertarget.cpp
indra/llrender/llrendertarget.h 2 additions, 3 deletions

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

indra/newview/app_settings/settings.xml
indra/newview/app_settings/shaders/class1/deferred/fxaaF.glsl 0 additions, 1 deletion

...a/newview/app_settings/shaders/class1/deferred/fxaaF.glsl
indra/newview/llfloaterpreference.cpp 4 additions, 1 deletion

indra/newview/llfloaterpreference.cpp
indra/newview/lltexturecache.cpp 13 additions, 2 deletions

indra/newview/lltexturecache.cpp
indra/newview/llviewerwindow.cpp 49 additions, 6 deletions

indra/newview/llviewerwindow.cpp
indra/newview/pipeline.cpp 56 additions, 24 deletions

indra/newview/pipeline.cpp
indra/newview/pipeline.h 18 additions, 1 deletion

indra/newview/pipeline.h

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