Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

unbroke more

Browse Source
This commit is contained in:
Siana Gearz
2010-12-24 23:43:13 +01:00
parent 1d6bb3f3ea
commit 5e01f8a0e6
2 changed files with 45 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/llviewermedia.cpp
View File

@@ -466,19 +466,6 @@ LLPluginClassMedia* LLViewerMediaImpl::newSourceFromMediaType(std::string media_
std::string user_data_path = gDirUtilp->getOSUserAppDir();
user_data_path += gDirUtilp->getDirDelimiter();
// Fix for EXT-5960 - make browser profile specific to user (cache, cookies etc.)
// If the linden username returned is blank, that can only mean we are
// at the login page displaying login Web page or Web browser test via Develop menu.
// In this case we just use whatever gDirUtilp->getOSUserAppDir() gives us (this
// is what we always used before this change)
std::string linden_user_dir = gDirUtilp->getLindenUserDir();
if ( ! linden_user_dir.empty() )
{
// gDirUtilp->getLindenUserDir() is whole path, not just Linden name
user_data_path = linden_user_dir;
user_data_path += gDirUtilp->getDirDelimiter();
}
// See if the plugin executable exists
llstat s;
if(LLFile::stat(launcher_name, &s))