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.

bc57c738

Commit bc57c738 authored 15 years ago by Yuri Chebotarev

Downloads
- Plain Diff

merge

--HG--
branch : product-engine

parents e8421572 4441b83e

No related branches found

No related tags found

Loading

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

indra/newview/llavatarlist.cpp 7 additions, 0 deletions

indra/newview/llavatarlist.cpp
indra/newview/llavatarlist.h 2 additions, 0 deletions

indra/newview/llavatarlist.h
indra/newview/llcallfloater.cpp 23 additions, 2 deletions

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

indra/newview/llcallfloater.h
indra/newview/llpanelavatar.cpp 23 additions, 0 deletions

indra/newview/llpanelavatar.cpp
indra/newview/llpanelavatar.h 4 additions, 0 deletions

indra/newview/llpanelavatar.h
indra/newview/llpanelimcontrolpanel.cpp 3 additions, 1 deletion

indra/newview/llpanelimcontrolpanel.cpp
indra/newview/llpanelpicks.h 3 additions, 1 deletion

indra/newview/llpanelpicks.h
indra/newview/llparticipantlist.cpp 1 addition, 0 deletions

indra/newview/llparticipantlist.cpp
indra/newview/skins/default/xui/en/floater_voice_controls.xml 3 additions, 3 deletions

...a/newview/skins/default/xui/en/floater_voice_controls.xml
indra/newview/skins/default/xui/en/panel_group_control_panel.xml 0 additions, 1 deletion

...ewview/skins/default/xui/en/panel_group_control_panel.xml

with 70 additions and 8 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