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.

425b071c

Commit 425b071c authored 3 years ago by David Parks

Downloads
- Plain Diff

Merge remote-tracking branch 'remotes/origin/DRTVWR-546' into SL-17005

parents e60024f0 977bd763

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

autobuild.xml 5 additions, 5 deletions

autobuild.xml
indra/llwindow/llwindowwin32.cpp 6 additions, 3 deletions

indra/llwindow/llwindowwin32.cpp
indra/newview/lltoolmorph.cpp 9 additions, 1 deletion

indra/newview/lltoolmorph.cpp
indra/newview/pipeline.cpp 31 additions, 172 deletions

indra/newview/pipeline.cpp
indra/newview/pipeline.h 1 addition, 2 deletions

indra/newview/pipeline.h
indra/newview/skins/default/xui/en/floater_model_preview.xml 1 addition, 1 deletion

indra/newview/skins/default/xui/en/floater_model_preview.xml
indra/newview/viewer_manifest.py 1 addition, 1 deletion

indra/newview/viewer_manifest.py

with 54 additions and 185 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