diff --git a/indra/llcommon/llmutex.cpp b/indra/llcommon/llmutex.cpp
index 4e83a4d882a854b23e27f0dd117d39385f04b749..b8e7384fc472d91422b03d9990ab6041993aa6e0 100644
--- a/indra/llcommon/llmutex.cpp
+++ b/indra/llcommon/llmutex.cpp
@@ -133,7 +133,7 @@ uintptr_t LLMutex::lockingThread() const
 	return mLockingThread;
 }
 
-bool LLMutex::trylock()
+bool LLMutex::try_lock()
 {
 	if(isSelfLocked())
 	{ //redundant lock
diff --git a/indra/llcommon/llmutex.h b/indra/llcommon/llmutex.h
index ebe1d54b142a91512f0da33b1ab6a0c9a862ae10..904da73f946075e37486e56565b3c35a41929c06 100644
--- a/indra/llcommon/llmutex.h
+++ b/indra/llcommon/llmutex.h
@@ -49,7 +49,7 @@ public:
 	virtual ~LLMutex();
 	
 	void lock();		// blocks
-	bool trylock();		// non-blocking, returns true if lock held.
+	bool try_lock();		// non-blocking, returns true if lock held.
 	void unlock();		// undefined behavior when called on mutex not being held
 	bool isLocked(); 	// non-blocking, but does do a lock/unlock so not free
 	bool isSelfLocked(); //return true if locked in a same thread
@@ -105,7 +105,7 @@ private:
 //============================================================================
 
 // Scoped locking class similar in function to LLMutexLock but uses
-// the trylock() method to conditionally acquire lock without
+// the try_lock() method to conditionally acquire lock without
 // blocking.  Caller resolves the resulting condition by calling
 // the isLocked() method and either punts or continues as indicated.
 //
@@ -120,7 +120,7 @@ public:
 		  mLocked(false)
 	{
 		if (mMutex)
-			mLocked = mMutex->trylock();
+			mLocked = mMutex->try_lock();
 	}
 
 	~LLMutexTrylock()
diff --git a/indra/llvfs/llvfs.cpp b/indra/llvfs/llvfs.cpp
index 1cc0e819db5e30ab75b5dede39c30aa7d33753dc..f62214042a274fbd1ba716de5a164b31df735b7b 100755
--- a/indra/llvfs/llvfs.cpp
+++ b/indra/llvfs/llvfs.cpp
@@ -234,7 +234,7 @@ LLVFS::LLVFS(const std::string& index_filename, const std::string& data_filename
 	mDataFP(NULL),
 	mIndexFP(NULL)
 {
-	mDataMutex = new LLMutex(0);
+	mDataMutex = new LLMutex(NULL);
 
 	S32 i;
 	for (i = 0; i < VFSLOCK_COUNT; i++)
diff --git a/indra/newview/llmeshrepository.cpp b/indra/newview/llmeshrepository.cpp
index fcb69e3e1e4af1da9a22edd99ee7d345d2e16b82..0eff72d63e7237f64ed05fc3439aad4c911869aa 100755
--- a/indra/newview/llmeshrepository.cpp
+++ b/indra/newview/llmeshrepository.cpp
@@ -2513,7 +2513,7 @@ void LLMeshRepoThread::notifyLoadedMeshes()
 
 	if (! mSkinInfoQ.empty() || ! mDecompositionQ.empty())
 	{
-		if (mMutex->trylock())
+		if (mMutex->try_lock())
 		{
 			std::list<LLMeshSkinInfo> skin_info_q;
 			std::list<LLModel::Decomposition*> decomp_q;