diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2015-07-10 19:44:47 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2015-07-10 19:44:47 -0400 |
commit | 68f42e4e102bd578386aeec3485233e332cbdcff (patch) | |
tree | 21faf4d9147cf89c13cb5845d161d4000daea4c9 /indra/llcommon/llcoros.cpp | |
parent | 9bde72f784a4836c3d19ef4dbcd49d4414640d8e (diff) |
MAINT-5351: Finish cleaning up messy merge from backing out backout
Diffstat (limited to 'indra/llcommon/llcoros.cpp')
-rwxr-xr-x | indra/llcommon/llcoros.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llcoros.cpp b/indra/llcommon/llcoros.cpp index 6cca5e7c60..d76401d01b 100755 --- a/indra/llcommon/llcoros.cpp +++ b/indra/llcommon/llcoros.cpp @@ -61,7 +61,7 @@ LLCoros::coro::self& LLCoros::get_self() return *current->mSelf; } -LLCoros::Suspending::Suspending(): +llcoro::Suspending::Suspending(): mSuspended(LLCoros::sCurrentCoro.get()) { // Revert mCurrentCoro to the value it had at the moment we last switched @@ -69,7 +69,7 @@ LLCoros::Suspending::Suspending(): LLCoros::sCurrentCoro.reset(mSuspended->mPrev); } -LLCoros::Suspending::~Suspending() +llcoro::Suspending::~Suspending() { // Okay, we're back, update our mPrev mSuspended->mPrev = LLCoros::sCurrentCoro.get(); |