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.

861e7b6b

Commit 861e7b6b authored 2 years ago by Ptolemy

Downloads
- Plain Diff

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

parents 8fa6bcb5 394479d7

No related branches found

No related tags found

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

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

indra/llprimitive/llmaterialid.cpp 7 additions, 0 deletions

indra/llprimitive/llmaterialid.cpp
indra/llprimitive/llmaterialid.h 1 addition, 0 deletions

indra/llprimitive/llmaterialid.h
indra/llprimitive/lltextureentry.h 8 additions, 0 deletions

indra/llprimitive/lltextureentry.h
indra/newview/llmaterialeditor.cpp 36 additions, 1 deletion

indra/newview/llmaterialeditor.cpp
indra/newview/llmaterialeditor.h 3 additions, 0 deletions

indra/newview/llmaterialeditor.h
indra/newview/llspatialpartition.h 10 additions, 3 deletions

indra/newview/llspatialpartition.h
indra/newview/llviewerobject.cpp 42 additions, 14 deletions

indra/newview/llviewerobject.cpp
indra/newview/llviewerobject.h 14 additions, 0 deletions

indra/newview/llviewerobject.h
indra/newview/llvovolume.cpp 35 additions, 5 deletions

indra/newview/llvovolume.cpp

with 156 additions and 23 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