diff options
author | David Seikel | 2011-02-25 05:58:41 +1000 |
---|---|---|
committer | David Seikel | 2011-02-25 05:58:41 +1000 |
commit | 8fa1dc90a9fec493b19604a4b4e08dc3208c7e8f (patch) | |
tree | 4cd1855e1658704d5eedd72dc64a95bc08b6c206 /linden/indra/newview/llfilepicker.cpp | |
parent | Merge branch 'weekly' into branding (diff) | |
download | meta-impy-8fa1dc90a9fec493b19604a4b4e08dc3208c7e8f.zip meta-impy-8fa1dc90a9fec493b19604a4b4e08dc3208c7e8f.tar.gz meta-impy-8fa1dc90a9fec493b19604a4b4e08dc3208c7e8f.tar.bz2 meta-impy-8fa1dc90a9fec493b19604a4b4e08dc3208c7e8f.tar.xz |
Unbranding. Todays word is "linden".
Diffstat (limited to 'linden/indra/newview/llfilepicker.cpp')
-rw-r--r-- | linden/indra/newview/llfilepicker.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/indra/newview/llfilepicker.cpp b/linden/indra/newview/llfilepicker.cpp index ec4e294..1839cb3 100644 --- a/linden/indra/newview/llfilepicker.cpp +++ b/linden/indra/newview/llfilepicker.cpp | |||
@@ -1305,7 +1305,7 @@ BOOL LLFilePicker::getSaveFile( ESaveFilter filter, const std::string& filename | |||
1305 | << "]" << llendl; | 1305 | << "]" << llendl; |
1306 | if (!filename.empty()) | 1306 | if (!filename.empty()) |
1307 | { | 1307 | { |
1308 | mFiles.push_back(gDirUtilp->getLindenUserDir() + gDirUtilp->getDirDelimiter() + filename); | 1308 | mFiles.push_back(gDirUtilp->getViewerUserDir() + gDirUtilp->getDirDelimiter() + filename); |
1309 | return TRUE; | 1309 | return TRUE; |
1310 | } | 1310 | } |
1311 | return FALSE; | 1311 | return FALSE; |
@@ -1316,7 +1316,7 @@ BOOL LLFilePicker::getOpenFile( ELoadFilter filter ) | |||
1316 | reset(); | 1316 | reset(); |
1317 | 1317 | ||
1318 | // HACK: Static filenames for 'open' until we implement filepicker | 1318 | // HACK: Static filenames for 'open' until we implement filepicker |
1319 | std::string filename = gDirUtilp->getLindenUserDir() + gDirUtilp->getDirDelimiter() + "upload"; | 1319 | std::string filename = gDirUtilp->getViewerUserDir() + gDirUtilp->getDirDelimiter() + "upload"; |
1320 | switch (filter) | 1320 | switch (filter) |
1321 | { | 1321 | { |
1322 | case FFLOAD_WAV: filename += ".wav"; break; | 1322 | case FFLOAD_WAV: filename += ".wav"; break; |