summaryrefslogtreecommitdiff
path: root/indra/newview/lldirpicker.cpp
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2019-05-08 17:38:13 -0700
committerGraham Linden <graham@lindenlab.com>2019-05-08 17:38:13 -0700
commitcd6044ed7a52e68e6050130ac2e9a637b8b7f339 (patch)
tree2295f1b2afce6815aec4b80ff447d65de31a67b4 /indra/newview/lldirpicker.cpp
parent22fc3409f4606459c6df219c343a002fc53a35cd (diff)
parent42fa05bd4cd8d587af4c216faca5e8c010812c8b (diff)
Merge viewer-release 6.2.2
Diffstat (limited to 'indra/newview/lldirpicker.cpp')
-rw-r--r--indra/newview/lldirpicker.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lldirpicker.cpp b/indra/newview/lldirpicker.cpp
index 5443afe60c..b8e6e81ee6 100644
--- a/indra/newview/lldirpicker.cpp
+++ b/indra/newview/lldirpicker.cpp
@@ -315,7 +315,7 @@ void LLDirPickerThread::run()
//static
void LLDirPickerThread::initClass()
{
- sMutex = new LLMutex(NULL);
+ sMutex = new LLMutex();
}
//static