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/llviewermedia.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/llviewermedia.cpp')
-rw-r--r-- | linden/indra/newview/llviewermedia.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/linden/indra/newview/llviewermedia.cpp b/linden/indra/newview/llviewermedia.cpp index f0faedf..417f5ff 100644 --- a/linden/indra/newview/llviewermedia.cpp +++ b/linden/indra/newview/llviewermedia.cpp | |||
@@ -467,15 +467,15 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_ | |||
467 | user_data_path += gDirUtilp->getDirDelimiter(); | 467 | user_data_path += gDirUtilp->getDirDelimiter(); |
468 | 468 | ||
469 | // Fix for EXT-5960 - make browser profile specific to user (cache, cookies etc.) | 469 | // Fix for EXT-5960 - make browser profile specific to user (cache, cookies etc.) |
470 | // If the linden username returned is blank, that can only mean we are | 470 | // If the username returned is blank, that can only mean we are |
471 | // at the login page displaying login Web page or Web browser test via Develop menu. | 471 | // at the login page displaying login Web page or Web browser test via Develop menu. |
472 | // In this case we just use whatever gDirUtilp->getOSUserAppDir() gives us (this | 472 | // In this case we just use whatever gDirUtilp->getOSUserAppDir() gives us (this |
473 | // is what we always used before this change) | 473 | // is what we always used before this change) |
474 | std::string linden_user_dir = gDirUtilp->getLindenUserDir(true); | 474 | std::string viewer_user_dir = gDirUtilp->getViewerUserDir(true); |
475 | if ( ! linden_user_dir.empty() ) | 475 | if ( ! viewer_user_dir.empty() ) |
476 | { | 476 | { |
477 | // gDirUtilp->getLindenUserDir() is whole path, not just Linden name | 477 | // gDirUtilp->getViewerUserDir() is whole path, not just username |
478 | user_data_path = linden_user_dir; | 478 | user_data_path = viewer_user_dir; |
479 | user_data_path += gDirUtilp->getDirDelimiter(); | 479 | user_data_path += gDirUtilp->getDirDelimiter(); |
480 | } | 480 | } |
481 | 481 | ||