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.

6153d09e

"README.md" did not exist on "fd46865a502036b9e4414e7ec4950faf551b1f14"

Commit 6153d09e authored 12 years ago by Gilbert Gonzales

Downloads
- Plain Diff

merging in latest changes

parents 02ca16c1 39ff545b

No related branches found

No related tags found

No related merge requests found

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

indra/llui/llbutton.cpp 13 additions, 5 deletions

indra/llui/llbutton.cpp
indra/newview/llconversationview.cpp 0 additions, 21 deletions

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

indra/newview/llconversationview.h
indra/newview/llfloaterimcontainer.cpp 36 additions, 16 deletions

indra/newview/llfloaterimcontainer.cpp
indra/newview/llfloaterimcontainer.h 3 additions, 1 deletion

indra/newview/llfloaterimcontainer.h
indra/newview/llfloaterimsessiontab.cpp 23 additions, 10 deletions

indra/newview/llfloaterimsessiontab.cpp
indra/newview/llimview.cpp 6 additions, 10 deletions

indra/newview/llimview.cpp
indra/newview/skins/default/xui/en/floater_conversation_log.xml 1 addition, 1 deletion

...newview/skins/default/xui/en/floater_conversation_log.xml
indra/newview/skins/default/xui/en/floater_im_session.xml 9 additions, 0 deletions

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

with 91 additions and 66 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