diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-03-14 14:54:45 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-03-14 14:54:45 -0400 |
| commit | 51e04f88666c03bd4589a587f5c2bbbf05463aa4 (patch) | |
| tree | 1158f464db264299c800b2562fa438b7f21d8a8d /indra/llvfs | |
| parent | 99e97bf6aebab653e6faefb4af8c2083af29aca8 (diff) | |
| parent | e9116575bfd2238e80eaac08bceb8f797d0e933c (diff) | |
merge changes for open-209
Diffstat (limited to 'indra/llvfs')
| -rwxr-xr-x | indra/llvfs/llvfile.cpp | 2 | ||||
| -rwxr-xr-x | indra/llvfs/tests/lldiriterator_test.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/indra/llvfs/llvfile.cpp b/indra/llvfs/llvfile.cpp index 306d7d8ec7..983e7c3b59 100755 --- a/indra/llvfs/llvfile.cpp +++ b/indra/llvfs/llvfile.cpp @@ -104,7 +104,7 @@ BOOL LLVFile::read(U8 *buffer, S32 bytes, BOOL async, F32 priority) // We can't do a read while there are pending async writes waitForLock(VFSLOCK_APPEND); - // *FIX: (???) + // *FIX: (?) if (async) { mHandle = sVFSThread->read(mVFS, mFileID, mFileType, buffer, mPosition, bytes, threadPri()); diff --git a/indra/llvfs/tests/lldiriterator_test.cpp b/indra/llvfs/tests/lldiriterator_test.cpp index 505d86faa7..a65e3dada5 100755 --- a/indra/llvfs/tests/lldiriterator_test.cpp +++ b/indra/llvfs/tests/lldiriterator_test.cpp @@ -51,9 +51,9 @@ namespace tut void test_chop_662(void) { // Check a selection of bad group names from the crash reports - LLDirIterator iter(".","+bad-group-name]+??-??.*"); - LLDirIterator iter1(".","))--@---bad-group-name2((??-??.*\\.txt"); - LLDirIterator iter2(".","__^v--x)Cuide d sua vida(x--v^__??-??.*"); + LLDirIterator iter(".","+bad-group-name]+?\?-??.*"); + LLDirIterator iter1(".","))--@---bad-group-name2((?\?-??.*\\.txt"); + LLDirIterator iter2(".","__^v--x)Cuide d sua vida(x--v^__?\?-??.*"); } template<> template<> |