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.

d7277171

Commit d7277171 authored 15 years ago by Mark Palange (Mani)

Downloads
- Plain Diff

Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0

parents 61b34c61 ec076c97

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

indra/llcommon/lltimer.cpp 4 additions, 5 deletions

indra/llcommon/lltimer.cpp
indra/llcommon/lltimer.h 1 addition, 1 deletion

indra/llcommon/lltimer.h
indra/newview/llcallfloater.cpp 1 addition, 2 deletions

indra/newview/llcallfloater.cpp
indra/newview/llspeakers.cpp 9 additions, 10 deletions

indra/newview/llspeakers.cpp
indra/newview/llspeakers.h 8 additions, 2 deletions

indra/newview/llspeakers.h

with 23 additions and 20 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