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.

15c3c3f9

Commit 15c3c3f9 authored 2 years ago by David Parks

Downloads
- Plain Diff

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

parents bc6ad188 16a7989f

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

indra/newview/app_settings/settings.xml 55 additions, 0 deletions

indra/newview/app_settings/settings.xml
indra/newview/app_settings/shaders/class2/windlight/skyF.glsl 2 additions, 2 deletions

...a/newview/app_settings/shaders/class2/windlight/skyF.glsl
indra/newview/llfloaterperms.cpp 1 addition, 0 deletions

indra/newview/llfloaterperms.cpp
indra/newview/llmaterialeditor.cpp 5 additions, 5 deletions

indra/newview/llmaterialeditor.cpp
indra/newview/llviewerinventory.cpp 22 additions, 0 deletions

indra/newview/llviewerinventory.cpp
indra/newview/skins/default/xui/en/floater_perms_default.xml 66 additions, 2 deletions

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

with 151 additions and 9 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