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.

6d6fcc46

Commit 6d6fcc46 authored 15 years ago by Tofu Linden

Downloads
- Plain Diff

Merge from viewer2voiceparity, conflicts resolved, and I fixed the 'speak'...

Merge from viewer2voiceparity, conflicts resolved, and I fixed the 'speak' button which is broken on trunk.

parents 95738da3 179f18d1

No related branches found

No related tags found

Loading

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

indra/newview/CMakeLists.txt 2 additions, 0 deletions

indra/newview/CMakeLists.txt
indra/newview/llbottomtray.cpp 1 addition, 1 deletion

indra/newview/llbottomtray.cpp
indra/newview/llbottomtray.h 2 additions, 2 deletions

indra/newview/llbottomtray.h
indra/newview/llchiclet.cpp 3 additions, 128 deletions

indra/newview/llchiclet.cpp
indra/newview/llchiclet.h 0 additions, 36 deletions

indra/newview/llchiclet.h
indra/newview/llnearbychatbar.cpp 5 additions, 4 deletions

indra/newview/llnearbychatbar.cpp
indra/newview/llnearbychatbar.h 5 additions, 2 deletions

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

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

indra/newview/llspeakbutton.h

with 274 additions and 173 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