diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-17 10:39:54 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-17 10:39:54 -0500 |
| commit | 7f58b4f2928f60f0a93f49c0897f84af3ea8a78b (patch) | |
| tree | ed64dc5178900cb9d31ecc47887fce7755962e7c /indra/newview/llviewermedia.cpp | |
| parent | dee9c80862ed54138889de8095087dda340ac073 (diff) | |
| parent | 74fdba829574e5132fec6633b0ddcd2feb9fe51e (diff) | |
merge changes for vwr-24401
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 8a0d0a6623..d3b6dcd86f 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; |