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.

3368fe15

Commit 3368fe15 authored 2 years ago by David Parks

Downloads
- Plain Diff

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

parents b1dabc0f 7edf1ac6

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

indra/newview/llgltfmateriallist.cpp 24 additions, 14 deletions

indra/newview/llgltfmateriallist.cpp
indra/newview/skins/default/xui/en/floater_live_material_editor.xml 2 additions, 0 deletions

...iew/skins/default/xui/en/floater_live_material_editor.xml
indra/newview/skins/default/xui/en/floater_material_editor.xml 1 addition, 0 deletions

.../newview/skins/default/xui/en/floater_material_editor.xml

with 27 additions and 14 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