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.

1fbdd880

Commit 1fbdd880 authored 13 years ago by Richard Linden

Downloads
- Plain Diff

Automated merge with ssh://hg.lindenlab.com/richard/viewer-social-3

parents 8c7d9bbd 67aba339

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

indra/newview/llcommandhandler.cpp 2 additions, 2 deletions

indra/newview/llcommandhandler.cpp
indra/newview/llfloaterpreference.cpp 22 additions, 8 deletions

indra/newview/llfloaterpreference.cpp
indra/newview/llviewerwindow.cpp 2 additions, 1 deletion

indra/newview/llviewerwindow.cpp
indra/newview/skins/default/xui/en/notifications.xml 12 additions, 11 deletions

indra/newview/skins/default/xui/en/notifications.xml
indra/newview/skins/default/xui/en/panel_preferences_privacy.xml 1 addition, 1 deletion

...ewview/skins/default/xui/en/panel_preferences_privacy.xml
indra/newview/skins/minimal/xui/en/panel_bottomtray.xml 1 addition, 1 deletion

indra/newview/skins/minimal/xui/en/panel_bottomtray.xml

with 40 additions and 24 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