diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-01-14 14:16:07 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-01-14 14:16:07 -0500 |
| commit | d82da834fa4026f2912406e9d39196ec7287f785 (patch) | |
| tree | 173094ca3fc90abbea3686d274c8a2dcb7adabd6 /indra/newview/llviewermedia.cpp | |
| parent | 584c7ecb4ed02e9ab039c6254ffc33331c31058c (diff) | |
| parent | 939e8d8f74687e7cb857c55bb6a8082226f1202b (diff) | |
Automated merge up from viewer-development
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index d78eef70bd..cd72e69055 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -54,7 +54,6 @@ #include "llfilepicker.h" #include "llnotifications.h" -#include "lldiriterator.h" #include "llevent.h" // LLSimpleListener #include "llnotificationsutil.h" #include "lluuid.h" @@ -1116,8 +1115,7 @@ void LLViewerMedia::clearAllCookies() } // the hard part: iterate over all user directories and delete the cookie file from each one - LLDirIterator dir_iter(base_dir, "*_*"); - while (dir_iter.next(filename)) + while(gDirUtilp->getNextFileInDir(base_dir, "*_*", filename)) { target = base_dir; target += filename; |