Merge pull request #1528 from secondlife/brad/merge-maint-a-to-dev

merge maint-a (including maint-x) into gltf_development

1 files changed, 10 insertions, 10 deletions

diff --git a/indra/llmessage/llcoproceduremanager.cpp b/indra/llmessage/llcoproceduremanager.cpp
index c0a5e361b1..959cfb2762 100644
--- a/indra/llmessage/llcoproceduremanager.cpp
+++ b/indra/llmessage/llcoproceduremanager.cpp
@@ -41,7 +41,7 @@
 //=========================================================================
 // Map of pool sizes for known pools
 static const std::map<std::string, U32> DefaultPoolSizes{
-	{std::string("Upload"),  1},
+    {std::string("Upload"),  1},
     {std::string("AIS"),     1},
     // *TODO: Rider for the moment keep AIS calls serialized otherwise the COF will tend to get out of sync.
 };
@@ -61,11 +61,11 @@ public:
     LLCoprocedurePool(const std::string &name, size_t size);
     ~LLCoprocedurePool();
 
-    /// Places the coprocedure on the queue for processing. 
-    /// 
+    /// Places the coprocedure on the queue for processing.
+    ///
     /// @param name Is used for debugging and should identify this coroutine.
-    /// @param proc Is a bound function to be executed 
-    /// 
+    /// @param proc Is a bound function to be executed
+    ///
     /// @return This method returns a UUID that can be used later to cancel execution.
     LLUUID enqueueCoprocedure(const std::string &name, CoProcedure_t proc);
 
@@ -91,7 +91,7 @@ public:
     }
 
     void close();
-    
+
 private:
     struct QueuedCoproc
     {
@@ -108,7 +108,7 @@ private:
         CoProcedure_t mProc;
     };
 
-    // we use a buffered_channel here rather than unbuffered_channel since we want to be able to 
+    // we use a buffered_channel here rather than unbuffered_channel since we want to be able to
     // push values without blocking,even if there's currently no one calling a pop operation (due to
     // fiber running right now)
     typedef boost::fibers::buffered_channel<QueuedCoproc::ptr_t>  CoprocQueue_t;
@@ -167,7 +167,7 @@ void LLCoprocedureManager::initializePool(const std::string &poolName)
 
     if (size == 0)
     {
-        // if not found grab the know default... if there is no known 
+        // if not found grab the know default... if there is no known
         // default use a reasonable number like 5.
         auto it = DefaultPoolSizes.find(poolName);
         size = (it != DefaultPoolSizes.end()) ? it->second : DEFAULT_POOL_SIZE;
@@ -190,7 +190,7 @@ void LLCoprocedureManager::initializePool(const std::string &poolName)
 //-------------------------------------------------------------------------
 LLUUID LLCoprocedureManager::enqueueCoprocedure(const std::string &pool, const std::string &name, CoProcedure_t proc)
 {
-    // Attempt to find the pool and enqueue the procedure.  If the pool does 
+    // Attempt to find the pool and enqueue the procedure.  If the pool does
     // not exist, create it.
     poolMap_t::iterator it = mPoolMap.find(pool);
 
@@ -355,7 +355,7 @@ LLCoprocedurePool::LLCoprocedurePool(const std::string &poolName, size_t size):
     LL_INFOS("CoProcMgr") << "Created coprocedure pool named \"" << mPoolName << "\" with " << size << " items, queue max " << LLCoprocedureManager::DEFAULT_QUEUE_SIZE << LL_ENDL;
 }
 
-LLCoprocedurePool::~LLCoprocedurePool() 
+LLCoprocedurePool::~LLCoprocedurePool()
 {
 }