3 files changed, 12 insertions, 4 deletions
diff --git a/indra/llmessage/CMakeLists.txt b/indra/llmessage/CMakeLists.txt
index e0922c0667..a2a57ad740 100644
--- a/indra/llmessage/CMakeLists.txt
+++ b/indra/llmessage/CMakeLists.txt
@@ -217,7 +217,7 @@ target_link_libraries(
   ${NGHTTP2_LIBRARIES}
   ${XMLRPCEPI_LIBRARIES}
   ${LLCOREHTTP_LIBRARIES}
-  ${BOOST_COROUTINE_LIBRARY}
+  ${BOOST_FIBER_LIBRARY}
   ${BOOST_CONTEXT_LIBRARY}
   ${BOOST_SYSTEM_LIBRARY}
   rt
@@ -235,7 +235,7 @@ target_link_libraries(
   ${NGHTTP2_LIBRARIES}
   ${XMLRPCEPI_LIBRARIES}
   ${LLCOREHTTP_LIBRARIES}
-  ${BOOST_COROUTINE_LIBRARY}
+  ${BOOST_FIBER_LIBRARY}
   ${BOOST_CONTEXT_LIBRARY}
   ${BOOST_SYSTEM_LIBRARY}
   )
@@ -264,7 +264,7 @@ if (LINUX)
     ${LLMESSAGE_LIBRARIES}
     ${LLCOREHTTP_LIBRARIES}
     ${JSONCPP_LIBRARIES}
-    ${BOOST_COROUTINE_LIBRARY}
+    ${BOOST_FIBER_LIBRARY}
     ${BOOST_CONTEXT_LIBRARY}
     rt
     ${GOOGLEMOCK_LIBRARIES}
@@ -280,7 +280,7 @@ else (LINUX)
     ${LLMESSAGE_LIBRARIES}
     ${LLCOREHTTP_LIBRARIES}
     ${JSONCPP_LIBRARIES}
-    ${BOOST_COROUTINE_LIBRARY}
+    ${BOOST_FIBER_LIBRARY}
     ${BOOST_CONTEXT_LIBRARY}
     ${GOOGLEMOCK_LIBRARIES}
     )
diff --git a/indra/llmessage/llcoproceduremanager.cpp b/indra/llmessage/llcoproceduremanager.cpp
index 74cdff2b00..4c85dd999a 100644
--- a/indra/llmessage/llcoproceduremanager.cpp
+++ b/indra/llmessage/llcoproceduremanager.cpp
@@ -203,6 +203,7 @@ void LLCoprocedureManager::cancelCoprocedure(const LLUUID &id)
     LL_INFOS() << "Coprocedure not found." << LL_ENDL;
 }
 
+/*==========================================================================*|
 void LLCoprocedureManager::shutdown(bool hardShutdown)
 {
     for (poolMap_t::const_iterator it = mPoolMap.begin(); it != mPoolMap.end(); ++it)
@@ -211,6 +212,7 @@ void LLCoprocedureManager::shutdown(bool hardShutdown)
     }
     mPoolMap.clear();
 }
+|*==========================================================================*/
 
 void LLCoprocedureManager::setPropertyMethods(SettingQuery_t queryfn, SettingUpdate_t updatefn)
 {
@@ -303,10 +305,13 @@ LLCoprocedurePool::LLCoprocedurePool(const std::string &poolName, size_t size):
 
 LLCoprocedurePool::~LLCoprocedurePool() 
 {
+/*==========================================================================*|
     shutdown();
+|*==========================================================================*/
 }
 
 //-------------------------------------------------------------------------
+/*==========================================================================*|
 void LLCoprocedurePool::shutdown(bool hardShutdown)
 {
     CoroAdapterMap_t::iterator it;
@@ -327,6 +332,7 @@ void LLCoprocedurePool::shutdown(bool hardShutdown)
     mCoroMapping.clear();
     mPendingCoprocs.clear();
 }
+|*==========================================================================*/
 
 //-------------------------------------------------------------------------
 LLUUID LLCoprocedurePool::enqueueCoprocedure(const std::string &name, LLCoprocedurePool::CoProcedure_t proc)
diff --git a/indra/llmessage/llcoproceduremanager.h b/indra/llmessage/llcoproceduremanager.h
index 7d0e83180c..ba6f97355c 100644
--- a/indra/llmessage/llcoproceduremanager.h
+++ b/indra/llmessage/llcoproceduremanager.h
@@ -59,9 +59,11 @@ public:
     /// If it has not yet been dequeued it is simply removed from the queue.
     void cancelCoprocedure(const LLUUID &id);
 
+/*==========================================================================*|
     /// Requests a shutdown of the upload manager. Passing 'true' will perform 
     /// an immediate kill on the upload coroutine.
     void shutdown(bool hardShutdown = false);
+|*==========================================================================*/
 
     void setPropertyMethods(SettingQuery_t queryfn, SettingUpdate_t updatefn);