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.

e0a1b46e

Commit e0a1b46e authored 6 years ago by Graham Linden

Downloads
- Plain Diff

Merge

parents 3494fa3c 8d333a01

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

indra/llinventory/llsettingsbase.cpp 2 additions, 0 deletions

indra/llinventory/llsettingsbase.cpp
indra/newview/llenvironment.cpp 44 additions, 35 deletions

indra/newview/llenvironment.cpp
indra/newview/llenvironment.h 37 additions, 5 deletions

indra/newview/llenvironment.h
indra/newview/llfloatereditextdaycycle.cpp 2 additions, 2 deletions

indra/newview/llfloatereditextdaycycle.cpp
indra/newview/llfloaterfixedenvironment.cpp 2 additions, 2 deletions

indra/newview/llfloaterfixedenvironment.cpp
indra/newview/llfloatermyenvironment.cpp 3 additions, 2 deletions

indra/newview/llfloatermyenvironment.cpp
indra/newview/llinventorybridge.cpp 4 additions, 2 deletions

indra/newview/llinventorybridge.cpp
indra/newview/llpanelenvironment.cpp 2 additions, 1 deletion

indra/newview/llpanelenvironment.cpp

with 96 additions and 49 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