Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

Alchemy Viewer
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

Silent mode is enabled

All outbound communications are blocked. Learn more.

3c121e83

Commit 3c121e83 authored 12 years ago by Gilbert Gonzales

Downloads
- Plain Diff

merge

parents c70a951a cbbf1504

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

indra/newview/llavataractions.cpp 13 additions, 1 deletion

indra/newview/llavataractions.cpp
indra/newview/llconversationview.cpp 7 additions, 0 deletions

indra/newview/llconversationview.cpp
indra/newview/llfloaterconversationpreview.cpp 14 additions, 3 deletions

indra/newview/llfloaterconversationpreview.cpp
indra/newview/llfloaterconversationpreview.h 5 additions, 0 deletions

indra/newview/llfloaterconversationpreview.h
indra/newview/llfloaterimcontainer.cpp 10 additions, 0 deletions

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

indra/newview/llfloaterimcontainer.h
indra/newview/lllogchat.cpp 26 additions, 0 deletions

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

indra/newview/lllogchat.h
indra/newview/llpanelpeoplemenus.cpp 6 additions, 1 deletion

indra/newview/llpanelpeoplemenus.cpp

with 83 additions and 5 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