diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-20 13:54:34 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-20 13:54:34 -0800 |
| commit | a65188d85f75e848d224bd335a00ed8aa51f945e (patch) | |
| tree | f43b390cba45d047fc0fa31659f6969f62b925d1 /indra/newview/llurlwhitelist.cpp | |
| parent | 1a8008ea150d1eb9a8f4036988ef971fb1901cb3 (diff) | |
| parent | 5ca943cd0279d35ffdf584fa0de3b795645f276c (diff) | |
Merge from viewer2. Minor conflict resolved.
Diffstat (limited to 'indra/newview/llurlwhitelist.cpp')
| -rw-r--r-- | indra/newview/llurlwhitelist.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llurlwhitelist.cpp b/indra/newview/llurlwhitelist.cpp index da69039cf9..46bc9276c1 100644 --- a/indra/newview/llurlwhitelist.cpp +++ b/indra/newview/llurlwhitelist.cpp @@ -121,6 +121,12 @@ bool LLUrlWhiteList::save () // build filename for each user std::string resolvedFilename = gDirUtilp->getExpandedFilename ( LL_PATH_PER_SL_ACCOUNT, mFilename ); + if (resolvedFilename.empty()) + { + llinfos << "No per-user dir for saving URL whitelist - presumably not logged in yet. Skipping." << llendl; + return false; + } + // open a file for writing llofstream file ( resolvedFilename ); if ( file.is_open () ) |