diff options
| author | Oz Linden <oz@lindenlab.com> | 2010-10-28 18:09:09 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2010-10-28 18:09:09 -0400 |
| commit | 4fa6500b5107f9d300a6ab7b6f011fb19621b05c (patch) | |
| tree | 3ae9e52f75ac2b9deeb17e21a9393697a2706806 /indra/llvfs/lldir_linux.cpp | |
| parent | 12ff24bae4ab88d5d6ca3361f491e05768e57bb4 (diff) | |
STORM-480 remove unused "wrap" parameter from LLDir::getNetFileInDir
--HG--
branch : storm-102
Diffstat (limited to 'indra/llvfs/lldir_linux.cpp')
| -rw-r--r-- | indra/llvfs/lldir_linux.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/indra/llvfs/lldir_linux.cpp b/indra/llvfs/lldir_linux.cpp index a1c6669b97..cf5fdd3b4a 100644 --- a/indra/llvfs/lldir_linux.cpp +++ b/indra/llvfs/lldir_linux.cpp @@ -243,8 +243,7 @@ U32 LLDir_Linux::countFilesInDir(const std::string &dirname, const std::string & } // get the next file in the directory -// automatically wrap if we've hit the end -BOOL LLDir_Linux::getNextFileInDir(const std::string &dirname, const std::string &mask, std::string &fname, BOOL wrap) +BOOL LLDir_Linux::getNextFileInDir(const std::string &dirname, const std::string &mask, std::string &fname) { glob_t g; BOOL result = FALSE; @@ -276,11 +275,6 @@ BOOL LLDir_Linux::getNextFileInDir(const std::string &dirname, const std::string mCurrentDirIndex++; - if((mCurrentDirIndex >= (int)g.gl_pathc) && wrap) - { - mCurrentDirIndex = 0; - } - if(mCurrentDirIndex < (int)g.gl_pathc) { // llinfos << "getNextFileInDir: returning number " << mCurrentDirIndex << ", path is " << g.gl_pathv[mCurrentDirIndex] << llendl; @@ -309,7 +303,6 @@ BOOL LLDir_Linux::getNextFileInDir(const std::string &dirname, const std::string // get a random file in the directory -// automatically wrap if we've hit the end void LLDir_Linux::getRandomFileInDir(const std::string &dirname, const std::string &mask, std::string &fname) { S32 num_files; |