diff options
author | Graham Linden <graham@lindenlab.com> | 2019-05-08 10:37:34 -0700 |
---|---|---|
committer | Graham Linden <graham@lindenlab.com> | 2019-05-08 10:37:34 -0700 |
commit | 65cb4b6d20b52ffebdc93e0e19f99520f6364dde (patch) | |
tree | d2b6ff74ce2d40f5de91b95fe7b5e21701d6e181 /indra/newview/lldirpicker.cpp | |
parent | f14888b6166f91533e778e94701b74a9639ebefd (diff) | |
parent | 34322f8f37380df868703051230f2a4109602b3f (diff) |
Merge 6.2.2
Diffstat (limited to 'indra/newview/lldirpicker.cpp')
-rw-r--r-- | indra/newview/lldirpicker.cpp | 2 |
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 |