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.

07e7fbb4

Commit 07e7fbb4 authored 10 years ago by David Parks

Downloads
- Plain Diff

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

parents 246d5014 90ee53f5

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

indra/newview/app_settings/settings.xml 1 addition, 1 deletion

indra/newview/app_settings/settings.xml
indra/newview/llfloaterhardwaresettings.cpp 0 additions, 15 deletions

indra/newview/llfloaterhardwaresettings.cpp
indra/newview/llfloaterhardwaresettings.h 0 additions, 2 deletions

indra/newview/llfloaterhardwaresettings.h
indra/newview/llviewertexture.cpp 1 addition, 1 deletion

indra/newview/llviewertexture.cpp
indra/newview/llviewertexturelist.cpp 8 additions, 20 deletions

indra/newview/llviewertexturelist.cpp
indra/newview/skins/default/xui/en/floater_hardware_settings.xml 3 additions, 2 deletions

...ewview/skins/default/xui/en/floater_hardware_settings.xml

with 13 additions and 41 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