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.

7f19e6de

Commit 7f19e6de authored 12 years ago by MaximB ProductEngine

Downloads
- Plain Diff

merge

parents 2dea7a52 a4a6e5a1

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

indra/newview/llavataractions.cpp 1 addition, 1 deletion

indra/newview/llavataractions.cpp
indra/newview/llfloaterimcontainer.cpp 14 additions, 9 deletions

indra/newview/llfloaterimcontainer.cpp
indra/newview/llfloaterimsessiontab.cpp 5 additions, 10 deletions

indra/newview/llfloaterimsessiontab.cpp
indra/newview/llfloaterpreference.cpp 31 additions, 0 deletions

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

indra/newview/llfloaterpreference.h
indra/newview/llimview.cpp 66 additions, 67 deletions

indra/newview/llimview.cpp
indra/newview/skins/default/xui/en/floater_incoming_call.xml 29 additions, 29 deletions

indra/newview/skins/default/xui/en/floater_incoming_call.xml
indra/newview/skins/default/xui/en/menu_participant_view.xml 4 additions, 1 deletion

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

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