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.

6abbe4cf

Commit 6abbe4cf authored 11 years ago by David Parks

Downloads
- Plain Diff

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

parents d9d2659e 7835d48f

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

indra/llmath/lloctree.h 11 additions, 4 deletions

indra/llmath/lloctree.h
indra/llwindow/llwindowwin32.cpp 15 additions, 2 deletions

indra/llwindow/llwindowwin32.cpp
indra/newview/app_settings/settings.xml 12 additions, 0 deletions

indra/newview/app_settings/settings.xml
indra/newview/llfloaterhardwaresettings.cpp 16 additions, 1 deletion

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

indra/newview/llfloaterhardwaresettings.h
indra/newview/llspatialpartition.cpp 1 addition, 0 deletions

indra/newview/llspatialpartition.cpp
indra/newview/llviewercontrol.cpp 1 addition, 0 deletions

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

indra/newview/llviewertexture.h
indra/newview/llviewertexturelist.cpp 6 additions, 9 deletions

indra/newview/llviewertexturelist.cpp
indra/newview/pipeline.cpp 1 addition, 0 deletions

indra/newview/pipeline.cpp
indra/newview/skins/default/xui/en/floater_hardware_settings.xml 1 addition, 2 deletions

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

with 67 additions and 19 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