Merge branch 'release/luau-scripting' into lua-resultset

1 files changed, 18 insertions, 18 deletions

diff --git a/indra/llcommon/llevents.cpp b/indra/llcommon/llevents.cpp
index 98bd990f31..6531b951b9 100644
--- a/indra/llcommon/llevents.cpp
+++ b/indra/llcommon/llevents.cpp
@@ -3,25 +3,25 @@
  * @author Nat Goodspeed
  * @date   2008-09-12
  * @brief  Implementation for llevents.
- * 
+ *
  * $LicenseInfo:firstyear=2008&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2010, Linden Research, Inc.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation;
  * version 2.1 of the License only.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
+ *
  * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
@@ -389,7 +389,7 @@ std::string LLEventPump::inventName(const std::string& pfx)
 
 void LLEventPump::clear()
 {
-    LLMutexLock lock(&mConnectionListMutex);
+    llcoro::LockType lock(mConnectionListMutex);
     // Destroy the original LLStandardSignal instance, replacing it with a
     // whole new one.
     mSignal = std::make_shared<LLStandardSignal>();
@@ -401,7 +401,7 @@ void LLEventPump::reset()
 {
     // Resetting mSignal is supposed to disconnect everything on its own
     // But due to crash on 'reset' added explicit cleanup to get more data
-    LLMutexLock lock(&mConnectionListMutex);
+    llcoro::LockType lock(mConnectionListMutex);
     ConnectionMap::const_iterator iter = mConnections.begin();
     ConnectionMap::const_iterator end = mConnections.end();
     while (iter!=end)
@@ -426,12 +426,12 @@ LLBoundListener LLEventPump::listen_impl(const std::string& name, const LLAwareL
         return LLBoundListener();
     }
 
-    LLMutexLock lock(&mConnectionListMutex);
+    llcoro::LockType lock(mConnectionListMutex);
 
     float nodePosition = 1.0;
 
-    // if the supplied name is empty we are not interested in the ordering mechanism 
-    // and can bypass attempting to find the optimal location to insert the new 
+    // if the supplied name is empty we are not interested in the ordering mechanism
+    // and can bypass attempting to find the optimal location to insert the new
     // listener.  We'll just tack it on to the end.
     if (!name.empty()) // should be the same as testing against ANONYMOUS
     {
@@ -576,12 +576,12 @@ LLBoundListener LLEventPump::listen_impl(const std::string& name, const LLAwareL
     // Now that newNode has a value that places it appropriately in mSignal,
     // connect it.
     LLBoundListener bound = mSignal->connect_extended(nodePosition, listener);
-    
+
     if (!name.empty())
     {   // note that we are not tracking anonymous listeners here either.
-        // This means that it is the caller's responsibility to either assign 
-        // to a TempBoundListerer (scoped_connection) or manually disconnect 
-        // when done. 
+        // This means that it is the caller's responsibility to either assign
+        // to a TempBoundListerer (scoped_connection) or manually disconnect
+        // when done.
         mConnections[name] = bound;
     }
     return bound;
@@ -589,7 +589,7 @@ LLBoundListener LLEventPump::listen_impl(const std::string& name, const LLAwareL
 
 LLBoundListener LLEventPump::getListener(const std::string& name)
 {
-    LLMutexLock lock(&mConnectionListMutex);
+    llcoro::LockType lock(mConnectionListMutex);
     ConnectionMap::const_iterator found = mConnections.find(name);
     if (found != mConnections.end())
     {
@@ -601,7 +601,7 @@ LLBoundListener LLEventPump::getListener(const std::string& name)
 
 void LLEventPump::stopListening(const std::string& name)
 {
-    LLMutexLock lock(&mConnectionListMutex);
+    llcoro::LockType lock(mConnectionListMutex);
     ConnectionMap::iterator found = mConnections.find(name);
     if (found != mConnections.end())
     {
@@ -648,9 +648,9 @@ bool LLEventMailDrop::post(const LLSD& event)
 {
     // forward the call to our base class
     bool posted = LLEventStream::post(event);
-    
+
     if (!posted)
-    {   // if the event was not handled we will save it for later so that it can 
+    {   // if the event was not handled we will save it for later so that it can
         // be posted to any future listeners when they attach.
         mEventHistory.push_back(event);
     }