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.

d5395502

Commit d5395502 authored 2 years ago by David Parks

Downloads
- Plain Diff

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

parents bc4694e8 6387fbb3

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

indra/newview/llmaterialeditor.cpp 14 additions, 0 deletions

indra/newview/llmaterialeditor.cpp
indra/newview/llpanelface.cpp 208 additions, 47 deletions

indra/newview/llpanelface.cpp
indra/newview/llpanelface.h 5 additions, 5 deletions

indra/newview/llpanelface.h
indra/newview/lltexturectrl.cpp 51 additions, 5 deletions

indra/newview/lltexturectrl.cpp
indra/newview/skins/default/xui/en/floater_texture_ctrl.xml 9 additions, 1 deletion

indra/newview/skins/default/xui/en/floater_texture_ctrl.xml
indra/newview/skins/default/xui/en/panel_tools_texture.xml 17 additions, 7 deletions

indra/newview/skins/default/xui/en/panel_tools_texture.xml

with 304 additions and 65 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