diff options
| author | Merov Linden <merov@lindenlab.com> | 2015-03-16 09:49:57 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2015-03-16 09:49:57 -0700 |
| commit | 9ba10bf1f2ee16eb082f4cb29b0b9f7172e7ce8e (patch) | |
| tree | 9548ff32e0a1dc5b3f8a70b2a386827f72bf5284 /indra/llvfs | |
| parent | 184bf6a76fd3b52efa83c93f56164d2adce7ed3e (diff) | |
| parent | d4a2e9fd9a0e7001a6c824ddd6cf37039a632b9d (diff) | |
Merge lindenlab/viewer-tools-update
Diffstat (limited to 'indra/llvfs')
| -rwxr-xr-x | indra/llvfs/lldiriterator.cpp | 3 | ||||
| -rwxr-xr-x | indra/llvfs/llvfs_objc.h | 2 | ||||
| -rwxr-xr-x | indra/llvfs/llvfs_objc.mm | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/indra/llvfs/lldiriterator.cpp b/indra/llvfs/lldiriterator.cpp index a9d96c9807..76296ff877 100755 --- a/indra/llvfs/lldiriterator.cpp +++ b/indra/llvfs/lldiriterator.cpp @@ -127,7 +127,8 @@ bool LLDirIterator::Impl::next(std::string &fname) { boost::smatch match; std::string name = mIter->path().filename().string(); - if (found = boost::regex_match(name, match, mFilterExp)) + found = boost::regex_match(name, match, mFilterExp); + if (found) { fname = name; } diff --git a/indra/llvfs/llvfs_objc.h b/indra/llvfs/llvfs_objc.h index 90101eb2e9..56cdbebfc5 100755 --- a/indra/llvfs/llvfs_objc.h +++ b/indra/llvfs/llvfs_objc.h @@ -40,4 +40,4 @@ std::string* getSystemResourceFolder(); std::string* getSystemExecutableFolder(); -#endif LL_LLVFS_OBJC_H +#endif // LL_LLVFS_OBJC_H diff --git a/indra/llvfs/llvfs_objc.mm b/indra/llvfs/llvfs_objc.mm index 47b0e73978..282ea41339 100755 --- a/indra/llvfs/llvfs_objc.mm +++ b/indra/llvfs/llvfs_objc.mm @@ -48,7 +48,7 @@ std::string* findSystemDirectory(NSSearchPathDirectory searchPathDirectory, { NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; - std::string *result; + std::string *result = nil; NSString *path = nil; // Search for the path |