diff options
| author | Ricky Curtice <kf6kjg+hg@gmail.com> | 2014-06-05 06:31:30 -0700 |
|---|---|---|
| committer | Ricky Curtice <kf6kjg+hg@gmail.com> | 2014-06-05 06:31:30 -0700 |
| commit | 98720c3cec8f1ab4af5e66f9d9b7bb9c277b78f1 (patch) | |
| tree | ef36b7031df4c96eab6b5f3343325f662382932c /indra/llvfs | |
| parent | 644ca6a0f8a7759119814f88df93b8e838321a12 (diff) | |
| parent | 15d8f355072f2184f046a7aafb1b5c606fe97880 (diff) | |
Merge
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 34b61ee0a0..b8588e99f4 100755 --- a/indra/llvfs/llvfile.cpp +++ b/indra/llvfs/llvfile.cpp @@ -105,7 +105,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<> |