From 68f42e4e102bd578386aeec3485233e332cbdcff Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 10 Jul 2015 19:44:47 -0400
Subject: MAINT-5351: Finish cleaning up messy merge from backing out backout

---
 indra/llcommon/llcoros.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/llcommon/llcoros.cpp')

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();
-- 
cgit v1.2.3