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.

7c2f2b52

Commit 7c2f2b52 authored 13 years ago by Richard Nelson

Downloads
- Plain Diff

Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui

parents fc2bd1cc 0976964f

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

indra/llui/lltoolbar.cpp 21 additions, 13 deletions

indra/llui/lltoolbar.cpp
indra/llui/lltoolbar.h 2 additions, 2 deletions

indra/llui/lltoolbar.h
indra/newview/llchannelmanager.cpp 1 addition, 0 deletions

indra/newview/llchannelmanager.cpp
indra/newview/llnearbychathandler.cpp 2 additions, 9 deletions

indra/newview/llnearbychathandler.cpp
indra/newview/llscreenchannel.cpp 124 additions, 12 deletions

indra/newview/llscreenchannel.cpp
indra/newview/llscreenchannel.h 4 additions, 1 deletion

indra/newview/llscreenchannel.h

with 154 additions and 37 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