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.

a77a49af

Commit a77a49af authored 12 years ago by Gilbert Gonzales

Downloads
- Plain Diff

merging in latest changes

parents 4105ae94 5269c6e3

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

indra/llui/llfolderview.h 0 additions, 1 deletion

indra/llui/llfolderview.h
indra/llui/llfolderviewitem.cpp 2 additions, 2 deletions

indra/llui/llfolderviewitem.cpp
indra/newview/llconversationmodel.cpp 2 additions, 5 deletions

indra/newview/llconversationmodel.cpp
indra/newview/llfloaterimcontainer.cpp 132 additions, 122 deletions

indra/newview/llfloaterimcontainer.cpp
indra/newview/llfloaterimcontainer.h 8 additions, 3 deletions

indra/newview/llfloaterimcontainer.h
indra/newview/llfloaterimnearbychat.cpp 11 additions, 10 deletions

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

indra/newview/llfloaterimnearbychat.h
indra/newview/llfloaterimsessiontab.cpp 59 additions, 0 deletions

indra/newview/llfloaterimsessiontab.cpp
indra/newview/llfloaterimsessiontab.h 7 additions, 0 deletions

indra/newview/llfloaterimsessiontab.h
indra/newview/llinventoryfunctions.cpp 1 addition, 1 deletion

indra/newview/llinventoryfunctions.cpp
indra/newview/skins/default/xui/en/menu_conversation.xml 9 additions, 3 deletions

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

with 232 additions and 148 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