diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2019-04-26 11:17:53 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2019-04-26 11:17:53 -0400 |
commit | 0d596aa4de2f583862274350ce6287c0ed8c2bec (patch) | |
tree | 90a6ca5b29d5c99b585233d059e16dccc23a2e19 /indra/newview/llviewermenufile.cpp | |
parent | 70aa89f708254c47766f4629e9131ea492829129 (diff) | |
parent | 85b431d5137886927efef35ca558bc8a998a5212 (diff) |
Automated merge with file:///Users/nat/linden/viewer-gridselect
Diffstat (limited to 'indra/newview/llviewermenufile.cpp')
-rw-r--r-- | indra/newview/llviewermenufile.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp index d2a5578568..a9a91b158b 100644 --- a/indra/newview/llviewermenufile.cpp +++ b/indra/newview/llviewermenufile.cpp @@ -175,7 +175,7 @@ void LLFilePickerThread::run() //static void LLFilePickerThread::initClass() { - sMutex = new LLMutex(NULL); + sMutex = new LLMutex(); } //static |