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.

d5f3e6b2

Commit d5f3e6b2 authored 15 years ago by Lynx Linden

Downloads
- Plain Diff

Automated merge with file:///home/lynx/hg/general/viewer-2-0

parents 3cfd8a7a 162924aa

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 49 additions, 1 deletion

indra/newview/llavataractions.cpp
indra/newview/llavataractions.h 13 additions, 0 deletions

indra/newview/llavataractions.h
indra/newview/llimview.cpp 11 additions, 1 deletion

indra/newview/llimview.cpp
indra/newview/llimview.h 3 additions, 0 deletions

indra/newview/llimview.h
indra/newview/llpanelimcontrolpanel.cpp 8 additions, 0 deletions

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

indra/newview/llpanelimcontrolpanel.h
indra/newview/llpanelpeople.cpp 4 additions, 3 deletions

indra/newview/llpanelpeople.cpp
indra/newview/skins/default/xui/en/strings.xml 3 additions, 0 deletions

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

with 95 additions and 6 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