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.

18ade97f

Commit 18ade97f authored 14 years ago by Oz Linden

Downloads
- Plain Diff

Automated merge with file:///Users/oz/Work/viewer-development

parents 084cee21 ba2300b8

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/app_settings/settings.xml 2 additions, 2 deletions

indra/newview/app_settings/settings.xml
indra/newview/llscreenchannel.cpp 12 additions, 28 deletions

indra/newview/llscreenchannel.cpp
indra/newview/llscreenchannel.h 4 additions, 4 deletions

indra/newview/llscreenchannel.h
indra/newview/lltoast.cpp 1 addition, 0 deletions

indra/newview/lltoast.cpp
indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml 1 addition, 1 deletion

...view/skins/default/xui/en/panel_preferences_graphics1.xml
indra/newview/skins/default/xui/en/widgets/chat_history.xml 1 addition, 0 deletions

indra/newview/skins/default/xui/en/widgets/chat_history.xml

with 21 additions and 35 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