#1354 Make coroutines use LLCoros::Mutex instead of LLMutex (#1356)

* #1354 Make coroutines use LLCoros::Mutex instead of LLMutex

* #1354 Fix some more unsafe coroutine executions.

* #1354 Implement changes requested by Nat

1 files changed, 28 insertions, 22 deletions

diff --git a/indra/newview/llvoicevivox.cpp b/indra/newview/llvoicevivox.cpp
index 310c9ee297..9a0aae944c 100644
--- a/indra/newview/llvoicevivox.cpp
+++ b/indra/newview/llvoicevivox.cpp
@@ -6437,37 +6437,43 @@ void LLVivoxVoiceClient::notifyStatusObservers(LLVoiceClientStatusObserver::ESta
 			}
 		}
 	}
-		
+	
 	LL_DEBUGS("Voice") 
 		<< " " << LLVoiceClientStatusObserver::status2string(status)  
 		<< ", session URI " << getAudioSessionURI() 
 		<< ", proximal is " << inSpatialChannel()
         << LL_ENDL;
 
-	for (status_observer_set_t::iterator it = mStatusObservers.begin();
-		it != mStatusObservers.end();
-		)
-	{
-		LLVoiceClientStatusObserver* observer = *it;
-		observer->onChange(status, getAudioSessionURI(), inSpatialChannel());
-		// In case onError() deleted an entry.
-		it = mStatusObservers.upper_bound(observer);
-	}
+    // this function is called from a coroutine, shuttle application hook back to main loop
+    auto work = [=]()
+        {
+            for (status_observer_set_t::iterator it = mStatusObservers.begin();
+                it != mStatusObservers.end();
+                )
+            {
+                LLVoiceClientStatusObserver* observer = *it;
+                observer->onChange(status, getAudioSessionURI(), inSpatialChannel());
+                // In case onError() deleted an entry.
+                it = mStatusObservers.upper_bound(observer);
+            }
 
-	// skipped to avoid speak button blinking
-	if (   status != LLVoiceClientStatusObserver::STATUS_JOINING
-		&& status != LLVoiceClientStatusObserver::STATUS_LEFT_CHANNEL
-		&& status != LLVoiceClientStatusObserver::STATUS_VOICE_DISABLED)
-	{
-		bool voice_status = LLVoiceClient::getInstance()->voiceEnabled() && LLVoiceClient::getInstance()->isVoiceWorking();
+            // skipped to avoid speak button blinking
+            if (status != LLVoiceClientStatusObserver::STATUS_JOINING
+                && status != LLVoiceClientStatusObserver::STATUS_LEFT_CHANNEL
+                && status != LLVoiceClientStatusObserver::STATUS_VOICE_DISABLED)
+            {
+                bool voice_status = LLVoiceClient::getInstance()->voiceEnabled() && LLVoiceClient::getInstance()->isVoiceWorking();
 
-		gAgent.setVoiceConnected(voice_status);
+                gAgent.setVoiceConnected(voice_status);
 
-		if (voice_status)
-		{
-			LLFirstUse::speak(true);
-		}
-	}
+                if (voice_status)
+                {
+                    LLFirstUse::speak(true);
+                }
+            }
+        };
+
+    LLAppViewer::instance()->postToMainCoro(work);
 }
 
 void LLVivoxVoiceClient::addObserver(LLFriendObserver* observer)