diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-05-10 10:56:40 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-05-10 10:56:40 -0400 |
| commit | 4d22c32aa9ac42b4a720200386d68339e8656974 (patch) | |
| tree | c84419f0f3ac44d2f64b7082c3c69c1fbec919d2 /indra/llvfs | |
| parent | 73e6711268adb93025386ffb766055125f0d849e (diff) | |
| parent | 33d9adfa9a07e0bf6f6ebd8213e843048ec92392 (diff) | |
merge changes for 3.5.2-beta4
Diffstat (limited to 'indra/llvfs')
28 files changed, 0 insertions, 0 deletions
diff --git a/indra/llvfs/CMakeLists.txt b/indra/llvfs/CMakeLists.txt index 67dce8c073..67dce8c073 100644..100755 --- a/indra/llvfs/CMakeLists.txt +++ b/indra/llvfs/CMakeLists.txt diff --git a/indra/llvfs/lldir.cpp b/indra/llvfs/lldir.cpp index 6899e9a44a..6899e9a44a 100644..100755 --- a/indra/llvfs/lldir.cpp +++ b/indra/llvfs/lldir.cpp diff --git a/indra/llvfs/lldir.h b/indra/llvfs/lldir.h index cc10ed5bbd..cc10ed5bbd 100644..100755 --- a/indra/llvfs/lldir.h +++ b/indra/llvfs/lldir.h diff --git a/indra/llvfs/lldir_linux.cpp b/indra/llvfs/lldir_linux.cpp index 4edd078640..4edd078640 100644..100755 --- a/indra/llvfs/lldir_linux.cpp +++ b/indra/llvfs/lldir_linux.cpp diff --git a/indra/llvfs/lldir_linux.h b/indra/llvfs/lldir_linux.h index e83a020ba4..e83a020ba4 100644..100755 --- a/indra/llvfs/lldir_linux.h +++ b/indra/llvfs/lldir_linux.h diff --git a/indra/llvfs/lldir_mac.cpp b/indra/llvfs/lldir_mac.cpp index c5041d434c..c5041d434c 100644..100755 --- a/indra/llvfs/lldir_mac.cpp +++ b/indra/llvfs/lldir_mac.cpp diff --git a/indra/llvfs/lldir_mac.h b/indra/llvfs/lldir_mac.h index 558727ebbc..558727ebbc 100644..100755 --- a/indra/llvfs/lldir_mac.h +++ b/indra/llvfs/lldir_mac.h diff --git a/indra/llvfs/lldir_solaris.cpp b/indra/llvfs/lldir_solaris.cpp index a97d72d539..a97d72d539 100644..100755 --- a/indra/llvfs/lldir_solaris.cpp +++ b/indra/llvfs/lldir_solaris.cpp diff --git a/indra/llvfs/lldir_solaris.h b/indra/llvfs/lldir_solaris.h index c6dac57e14..c6dac57e14 100644..100755 --- a/indra/llvfs/lldir_solaris.h +++ b/indra/llvfs/lldir_solaris.h diff --git a/indra/llvfs/lldir_win32.cpp b/indra/llvfs/lldir_win32.cpp index 462d1cce06..462d1cce06 100644..100755 --- a/indra/llvfs/lldir_win32.cpp +++ b/indra/llvfs/lldir_win32.cpp diff --git a/indra/llvfs/lldir_win32.h b/indra/llvfs/lldir_win32.h index 450efaf9da..450efaf9da 100644..100755 --- a/indra/llvfs/lldir_win32.h +++ b/indra/llvfs/lldir_win32.h diff --git a/indra/llvfs/lldirguard.h b/indra/llvfs/lldirguard.h index 4330095ad0..4330095ad0 100644..100755 --- a/indra/llvfs/lldirguard.h +++ b/indra/llvfs/lldirguard.h diff --git a/indra/llvfs/lldiriterator.cpp b/indra/llvfs/lldiriterator.cpp index 460d2a8b4f..460d2a8b4f 100644..100755 --- a/indra/llvfs/lldiriterator.cpp +++ b/indra/llvfs/lldiriterator.cpp diff --git a/indra/llvfs/lldiriterator.h b/indra/llvfs/lldiriterator.h index 0b48be41b3..0b48be41b3 100644..100755 --- a/indra/llvfs/lldiriterator.h +++ b/indra/llvfs/lldiriterator.h diff --git a/indra/llvfs/lllfsthread.cpp b/indra/llvfs/lllfsthread.cpp index 073b1af2a1..073b1af2a1 100644..100755 --- a/indra/llvfs/lllfsthread.cpp +++ b/indra/llvfs/lllfsthread.cpp diff --git a/indra/llvfs/lllfsthread.h b/indra/llvfs/lllfsthread.h index cdb5c75946..cdb5c75946 100644..100755 --- a/indra/llvfs/lllfsthread.h +++ b/indra/llvfs/lllfsthread.h diff --git a/indra/llvfs/llpidlock.cpp b/indra/llvfs/llpidlock.cpp index 0424f2379e..0424f2379e 100644..100755 --- a/indra/llvfs/llpidlock.cpp +++ b/indra/llvfs/llpidlock.cpp diff --git a/indra/llvfs/llpidlock.h b/indra/llvfs/llpidlock.h index d3295f4911..d3295f4911 100644..100755 --- a/indra/llvfs/llpidlock.h +++ b/indra/llvfs/llpidlock.h diff --git a/indra/llvfs/llvfile.cpp b/indra/llvfs/llvfile.cpp index 03d2cc25e3..03d2cc25e3 100644..100755 --- a/indra/llvfs/llvfile.cpp +++ b/indra/llvfs/llvfile.cpp diff --git a/indra/llvfs/llvfile.h b/indra/llvfs/llvfile.h index 7e9d9f73e5..7e9d9f73e5 100644..100755 --- a/indra/llvfs/llvfile.h +++ b/indra/llvfs/llvfile.h diff --git a/indra/llvfs/llvfs.cpp b/indra/llvfs/llvfs.cpp index 82c926620a..82c926620a 100644..100755 --- a/indra/llvfs/llvfs.cpp +++ b/indra/llvfs/llvfs.cpp diff --git a/indra/llvfs/llvfs.h b/indra/llvfs/llvfs.h index 63f0f28933..63f0f28933 100644..100755 --- a/indra/llvfs/llvfs.h +++ b/indra/llvfs/llvfs.h diff --git a/indra/llvfs/llvfs_objc.h b/indra/llvfs/llvfs_objc.h index 90101eb2e9..90101eb2e9 100644..100755 --- a/indra/llvfs/llvfs_objc.h +++ b/indra/llvfs/llvfs_objc.h diff --git a/indra/llvfs/llvfs_objc.mm b/indra/llvfs/llvfs_objc.mm index 4f9e2f81e9..4f9e2f81e9 100644..100755 --- a/indra/llvfs/llvfs_objc.mm +++ b/indra/llvfs/llvfs_objc.mm diff --git a/indra/llvfs/llvfsthread.cpp b/indra/llvfs/llvfsthread.cpp index a57e2b15ab..a57e2b15ab 100644..100755 --- a/indra/llvfs/llvfsthread.cpp +++ b/indra/llvfs/llvfsthread.cpp diff --git a/indra/llvfs/llvfsthread.h b/indra/llvfs/llvfsthread.h index 95f3c857c6..95f3c857c6 100644..100755 --- a/indra/llvfs/llvfsthread.h +++ b/indra/llvfs/llvfsthread.h diff --git a/indra/llvfs/tests/lldir_test.cpp b/indra/llvfs/tests/lldir_test.cpp index 3cff622a4b..3cff622a4b 100644..100755 --- a/indra/llvfs/tests/lldir_test.cpp +++ b/indra/llvfs/tests/lldir_test.cpp diff --git a/indra/llvfs/tests/lldiriterator_test.cpp b/indra/llvfs/tests/lldiriterator_test.cpp index 505d86faa7..505d86faa7 100644..100755 --- a/indra/llvfs/tests/lldiriterator_test.cpp +++ b/indra/llvfs/tests/lldiriterator_test.cpp |