aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewermedia.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llviewermedia.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/linden/indra/newview/llviewermedia.cpp b/linden/indra/newview/llviewermedia.cpp
index dbb6f62..c38408d 100644
--- a/linden/indra/newview/llviewermedia.cpp
+++ b/linden/indra/newview/llviewermedia.cpp
@@ -502,15 +502,15 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_
502 user_data_path += gDirUtilp->getDirDelimiter(); 502 user_data_path += gDirUtilp->getDirDelimiter();
503 503
504 // Fix for EXT-5960 - make browser profile specific to user (cache, cookies etc.) 504 // Fix for EXT-5960 - make browser profile specific to user (cache, cookies etc.)
505 // If the linden username returned is blank, that can only mean we are 505 // If the username returned is blank, that can only mean we are
506 // at the login page displaying login Web page or Web browser test via Develop menu. 506 // at the login page displaying login Web page or Web browser test via Develop menu.
507 // In this case we just use whatever gDirUtilp->getOSUserAppDir() gives us (this 507 // In this case we just use whatever gDirUtilp->getOSUserAppDir() gives us (this
508 // is what we always used before this change) 508 // is what we always used before this change)
509 std::string linden_user_dir = gDirUtilp->getLindenUserDir(true); 509 std::string viewer_user_dir = gDirUtilp->getViewerUserDir(true);
510 if ( ! linden_user_dir.empty() ) 510 if ( ! viewer_user_dir.empty() )
511 { 511 {
512 // gDirUtilp->getLindenUserDir() is whole path, not just Linden name 512 // gDirUtilp->getViewerUserDir() is whole path, not just username
513 user_data_path = linden_user_dir; 513 user_data_path = viewer_user_dir;
514 user_data_path += gDirUtilp->getDirDelimiter(); 514 user_data_path += gDirUtilp->getDirDelimiter();
515 } 515 }
516 516