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.

7a45dec2

Commit 7a45dec2 authored 15 years ago by James Cook

Downloads
- Plain Diff

merge

parents de6ca4c5 d6136a40

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

indra/newview/llbottomtray.cpp 36 additions, 0 deletions

indra/newview/llbottomtray.cpp
indra/newview/llbottomtray.h 6 additions, 1 deletion

indra/newview/llbottomtray.h
indra/newview/llnearbychatbar.cpp 0 additions, 30 deletions

indra/newview/llnearbychatbar.cpp
indra/newview/llnearbychatbar.h 0 additions, 10 deletions

indra/newview/llnearbychatbar.h
indra/newview/llspeakbutton.cpp 10 additions, 0 deletions

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

indra/newview/llspeakbutton.h
indra/newview/skins/default/xui/en/panel_bottomtray.xml 3 additions, 3 deletions

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

with 60 additions and 44 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