diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-09-06 09:42:11 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-09-06 09:42:11 -0400 |
| commit | 08c0de785f29801c57feebce8fae593f86113777 (patch) | |
| tree | 6661b84ca6540f0907b4321f6e49a88be75c2e98 /indra/newview/llviewermenufile.cpp | |
| parent | 76f867c8913094573bfa278fc39907d6b0779ec5 (diff) | |
| parent | 0ab6eee0996c78d32b722157140cea5a21a5e460 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewermenufile.cpp')
| -rw-r--r-- | indra/newview/llviewermenufile.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp index b9293b3b31..8139f7deda 100644 --- a/indra/newview/llviewermenufile.cpp +++ b/indra/newview/llviewermenufile.cpp @@ -149,7 +149,7 @@ void LLFilePickerThread::run() //static void LLFilePickerThread::initClass() { - sMutex = new LLMutex(NULL); + sMutex = new LLMutex(); } //static @@ -816,8 +816,7 @@ LLUUID upload_new_resource( uuid = tid.makeAssetID(gAgent.getSecureSessionID()); // copy this file into the vfs for upload S32 file_size; - LLAPRFile infile ; - infile.open(filename, LL_APR_RB, NULL, &file_size); + LLAPRFile infile(filename, LL_APR_RB, &file_size); if (infile.getFileHandle()) { LLVFile file(gVFS, uuid, asset_type, LLVFile::WRITE); |