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.

48163bdc

Commit 48163bdc authored 15 years ago by Nat Goodspeed

Downloads
- Plain Diff

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

parents 02943eca f8ddc9a8

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

indra/llcommon/CMakeLists.txt 1 addition, 0 deletions

indra/llcommon/CMakeLists.txt
indra/llcommon/llevents.h 2 additions, 0 deletions

indra/llcommon/llevents.h
indra/llcommon/llinstancetracker.h 64 additions, 26 deletions

indra/llcommon/llinstancetracker.h
indra/llcommon/lltimer.cpp 6 additions, 6 deletions

indra/llcommon/lltimer.cpp
indra/llcommon/tests/llinstancetracker_test.cpp 160 additions, 0 deletions

indra/llcommon/tests/llinstancetracker_test.cpp
indra/llui/lllayoutstack.cpp 2 additions, 2 deletions

indra/llui/lllayoutstack.cpp
indra/newview/llnamelistctrl.cpp 2 additions, 2 deletions

indra/newview/llnamelistctrl.cpp

with 237 additions and 36 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