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.

f86be5c8

Commit f86be5c8 authored 12 years ago by mberezhnoy

Downloads
- Plain Diff

merge

parents 385de35b 0af5b073

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

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

indra/llui/lltoolbar.cpp
indra/newview/app_settings/settings_per_account.xml 1 addition, 1 deletion

indra/newview/app_settings/settings_per_account.xml
indra/newview/llfloaterimcontainer.cpp 15 additions, 3 deletions

indra/newview/llfloaterimcontainer.cpp
indra/newview/llfloaterimcontainer.h 1 addition, 0 deletions

indra/newview/llfloaterimcontainer.h
indra/newview/llfloaterimnearbychat.cpp 18 additions, 1 deletion

indra/newview/llfloaterimnearbychat.cpp
indra/newview/llfloaterimsessiontab.cpp 63 additions, 27 deletions

indra/newview/llfloaterimsessiontab.cpp
indra/newview/llfloaterimsessiontab.h 9 additions, 3 deletions

indra/newview/llfloaterimsessiontab.h
indra/newview/llvoavatar.cpp 5 additions, 7 deletions

indra/newview/llvoavatar.cpp
indra/newview/llvoavatar.h 1 addition, 1 deletion

indra/newview/llvoavatar.h
indra/newview/llvoicevivox.cpp 25 additions, 44 deletions

indra/newview/llvoicevivox.cpp
indra/newview/llvoicevivox.h 0 additions, 1 deletion

indra/newview/llvoicevivox.h
indra/newview/skins/default/xui/en/floater_im_session.xml 11 additions, 9 deletions

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

with 151 additions and 100 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