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.

9bde72f7

Commit 9bde72f7 authored 9 years ago by Nat Goodspeed

Downloads
- Plain Diff

Automated merge with file:///Users/nat/linden/maint-4952-v-t-u

parents 391d9a36 0c915913

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

indra/llcommon/llcoros.cpp 51 additions, 58 deletions

indra/llcommon/llcoros.cpp
indra/llcommon/llcoros.h 52 additions, 5 deletions

indra/llcommon/llcoros.h
indra/llcommon/lleventcoro.cpp 1 addition, 1 deletion

indra/llcommon/lleventcoro.cpp
indra/llcommon/tests/lleventcoro_test.cpp 1 addition, 0 deletions

indra/llcommon/tests/lleventcoro_test.cpp
indra/llcorehttp/CMakeLists.txt 4 additions, 0 deletions

indra/llcorehttp/CMakeLists.txt
indra/newview/llviewerregion.cpp 1 addition, 1 deletion

indra/newview/llviewerregion.cpp

with 110 additions and 65 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