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.

40fbaac0

Commit 40fbaac0 authored 1 year ago by Logue

Downloads
- Plain Diff

Merge branch 'main' of git.alchemyviewer.org:alchemy/alchemy-next

parents 4d27271c 397e58df

No related branches found

No related tags found

Loading

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

indra/newview/app_settings/commands.xml 12 additions, 1 deletion

indra/newview/app_settings/commands.xml
indra/newview/llfloaterimnearbychat.cpp 6 additions, 2 deletions

indra/newview/llfloaterimnearbychat.cpp
indra/newview/llfloaterimnearbychathandler.cpp 2 additions, 1 deletion

indra/newview/llfloaterimnearbychathandler.cpp
indra/newview/llfloaterimsessiontab.cpp 2 additions, 1 deletion

indra/newview/llfloaterimsessiontab.cpp
indra/newview/llimview.cpp 15 additions, 9 deletions

indra/newview/llimview.cpp
indra/newview/skins/default/xui/en/menu_im_session_showmodes.xml 21 additions, 0 deletions

...ewview/skins/default/xui/en/menu_im_session_showmodes.xml
indra/newview/skins/default/xui/en/strings.xml 1 addition, 1 deletion

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

with 59 additions and 15 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