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.

93389059

Commit 93389059 authored 2 years ago by David Parks

Downloads
- Plain Diff

Merge branch 'DRTVWR-559' of ssh://bitbucket.org/lindenlab/viewer into DRTVWR-559

parents 2a5219b2 2e268392

No related branches found

No related tags found

2 merge requests!3Update to main branch,!2Rebase onto current main branch

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

indra/newview/app_settings/shaders/class1/deferred/deferredUtil.glsl 1 addition, 1 deletion

...ew/app_settings/shaders/class1/deferred/deferredUtil.glsl
indra/newview/llreflectionmap.cpp 5 additions, 0 deletions

indra/newview/llreflectionmap.cpp
indra/newview/llselectmgr.cpp 124 additions, 14 deletions

indra/newview/llselectmgr.cpp
indra/newview/lltexturectrl.cpp 1 addition, 50 deletions

indra/newview/lltexturectrl.cpp
indra/newview/lltooldraganddrop.cpp 5 additions, 0 deletions

indra/newview/lltooldraganddrop.cpp
indra/newview/llviewerobject.cpp 6 additions, 1 deletion

indra/newview/llviewerobject.cpp

with 142 additions and 66 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