diff options
| author | Jacek Antonelli | 2008-12-17 01:24:37 -0600 |
|---|---|---|
| committer | Jacek Antonelli | 2008-12-17 01:24:37 -0600 |
| commit | a3b0b6c299f791b3d8132d36a3d4c1790aea86b1 (patch) | |
| tree | 07d9080e0f71845fdf07f666907422b2fe6c4a3f /linden/indra/newview/llurlhistory.cpp | |
| parent | Use NType to find inventory icon name (part 2 of 2). (diff) | |
| parent | VWR-1582: Local ruler mode wrong for linked objects. (diff) | |
| download | meta-impy-a3b0b6c299f791b3d8132d36a3d4c1790aea86b1.zip meta-impy-a3b0b6c299f791b3d8132d36a3d4c1790aea86b1.tar.gz meta-impy-a3b0b6c299f791b3d8132d36a3d4c1790aea86b1.tar.bz2 meta-impy-a3b0b6c299f791b3d8132d36a3d4c1790aea86b1.tar.xz | |
Merge 1.1.0 alpha into quickfilter
Diffstat (limited to 'linden/indra/newview/llurlhistory.cpp')
| -rw-r--r-- | linden/indra/newview/llurlhistory.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/linden/indra/newview/llurlhistory.cpp b/linden/indra/newview/llurlhistory.cpp index ac3fa93..c10add4 100644 --- a/linden/indra/newview/llurlhistory.cpp +++ b/linden/indra/newview/llurlhistory.cpp | |||
| @@ -72,9 +72,17 @@ bool LLURLHistory::loadFile(const std::string& filename) | |||
| 72 | 72 | ||
| 73 | // static | 73 | // static |
| 74 | bool LLURLHistory::saveFile(const std::string& filename) | 74 | bool LLURLHistory::saveFile(const std::string& filename) |
| 75 | { | 75 | { |
| 76 | std::string temp_str = gDirUtilp->getLindenUserDir() + gDirUtilp->getDirDelimiter(); | 76 | std::string temp_str = gDirUtilp->getLindenUserDir(); |
| 77 | llofstream out((temp_str + filename)); | 77 | if( temp_str.empty() ) |
| 78 | { | ||
| 79 | llwarns << "Can't save " << filename | ||
| 80 | << ": No user directory set." << llendl; | ||
| 81 | return false; | ||
| 82 | } | ||
| 83 | |||
| 84 | temp_str += gDirUtilp->getDirDelimiter() + filename; | ||
| 85 | llofstream out(temp_str); | ||
| 78 | if (!out.good()) | 86 | if (!out.good()) |
| 79 | { | 87 | { |
| 80 | llwarns << "Unable to open " << filename << " for output." << llendl; | 88 | llwarns << "Unable to open " << filename << " for output." << llendl; |