diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2025-03-12 04:32:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-12 04:32:05 +0200 |
| commit | b50ad90febda24d2296541f46ea1a129232aad70 (patch) | |
| tree | d0c25fc032c156814b4b05c892dcfce1737508a1 /indra/newview/llviewermedia.cpp | |
| parent | e70694e67cd1902fd2a797e24c48f08643291538 (diff) | |
| parent | 8297b923f0bec459ca2bfa916cf777ac5aa3af9e (diff) | |
Merge pull request #3708 from secondlife/marchcat/2025.03-maint-b
2025.03 Cherry pick from Maint B
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
| -rw-r--r-- | indra/newview/llviewermedia.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index d688d5930c..82a52e63f6 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -1730,8 +1730,6 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_ std::string user_data_path_cache = gDirUtilp->getCacheDir(false); user_data_path_cache += gDirUtilp->getDirDelimiter(); - std::string user_data_path_cef_log = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "cef_log.txt"); - // See if the plugin executable exists llstat s; if(LLFile::stat(launcher_name, &s)) @@ -1748,6 +1746,7 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_ { media_source = new LLPluginClassMedia(owner); media_source->setSize(default_width, default_height); + std::string user_data_path_cef_log = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, "cef.log"); media_source->setUserDataPath(user_data_path_cache, gDirUtilp->getUserName(), user_data_path_cef_log); media_source->setLanguageCode(LLUI::getLanguage()); media_source->setZoomFactor(zoom_factor); |