Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

Alchemy Viewer
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

Silent mode is enabled

All outbound communications are blocked. Learn more.

0d420f1e

Commit 0d420f1e authored 9 years ago by Drake Arconis

Downloads
- Plain Diff

Merge

parents 70b476a3 cda35e83

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

indra/newview/llfloaterpreference.cpp 96 additions, 1 deletion

indra/newview/llfloaterpreference.cpp
indra/newview/llfloaterpreference.h 10 additions, 0 deletions

indra/newview/llfloaterpreference.h
indra/newview/llpanellogin.cpp 27 additions, 23 deletions

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

indra/newview/llpanellogin.h
indra/newview/llviewernetwork.cpp 207 additions, 5 deletions

indra/newview/llviewernetwork.cpp
indra/newview/llviewernetwork.h 49 additions, 10 deletions

indra/newview/llviewernetwork.h
indra/newview/skins/default/xui/en/floater_preferences.xml 6 additions, 7 deletions

indra/newview/skins/default/xui/en/floater_preferences.xml
indra/newview/skins/default/xui/en/notifications.xml 48 additions, 0 deletions

indra/newview/skins/default/xui/en/notifications.xml
indra/newview/skins/default/xui/en/panel_preferences_grids.xml 119 additions, 0 deletions

.../newview/skins/default/xui/en/panel_preferences_grids.xml
indra/newview/tests/lllogininstance_test.cpp 2 additions, 0 deletions

indra/newview/tests/lllogininstance_test.cpp
indra/newview/tests/llslurl_test.cpp 1 addition, 2 deletions

indra/newview/tests/llslurl_test.cpp
indra/newview/tests/llviewernetwork_test.cpp 6 additions, 7 deletions

indra/newview/tests/llviewernetwork_test.cpp

with 574 additions and 55 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