MAINT-8297 path fix

Fri, 02 Mar 2018 18:47:35 +0200

author
andreykproductengine <andreykproductengine@lindenlab.com>
date
Fri, 02 Mar 2018 18:47:35 +0200
changeset 55320
b335ad15f178
parent 55313
e817ee85d86a
child 55321
44aa78dae0cf

MAINT-8297 path fix

indra/llvfs/lldir_linux.cpp file | annotate | diff | revisions
indra/llvfs/lldir_mac.cpp file | annotate | diff | revisions
indra/llvfs/lldir_solaris.cpp file | annotate | diff | revisions
     1.1 --- a/indra/llvfs/lldir_linux.cpp	Fri Mar 02 00:30:35 2018 +0200
     1.2 +++ b/indra/llvfs/lldir_linux.cpp	Fri Mar 02 18:47:35 2018 +0200
     1.3 @@ -208,7 +208,7 @@
     1.4  		LL_WARNS() << "Couldn't create LL_PATH_CACHE dir " << getExpandedFilename(LL_PATH_CACHE,"") << LL_ENDL;
     1.5  	}
     1.6  
     1.7 -	mCAFile = getExpandedFilename(LL_PATH_APP_SETTINGS, "ca-bundle.crt");
     1.8 +	mCAFile = getExpandedFilename(LL_PATH_EXECUTABLE, "ca-bundle.crt");
     1.9  }
    1.10  
    1.11  U32 LLDir_Linux::countFilesInDir(const std::string &dirname, const std::string &mask)
     2.1 --- a/indra/llvfs/lldir_mac.cpp	Fri Mar 02 00:30:35 2018 +0200
     2.2 +++ b/indra/llvfs/lldir_mac.cpp	Fri Mar 02 18:47:35 2018 +0200
     2.3 @@ -173,7 +173,7 @@
     2.4  		mAppRODataDir = app_read_only_data_dir;
     2.5  		mSkinBaseDir = mAppRODataDir + mDirDelimiter + "skins";
     2.6  	}
     2.7 -	mCAFile = getExpandedFilename(LL_PATH_APP_SETTINGS, "ca-bundle.crt");
     2.8 +	mCAFile = getExpandedFilename(LL_PATH_EXECUTABLE, "ca-bundle.crt");
     2.9  }
    2.10  
    2.11  std::string LLDir_Mac::getCurPath()
     3.1 --- a/indra/llvfs/lldir_solaris.cpp	Fri Mar 02 00:30:35 2018 +0200
     3.2 +++ b/indra/llvfs/lldir_solaris.cpp	Fri Mar 02 18:47:35 2018 +0200
     3.3 @@ -226,7 +226,7 @@
     3.4  		LL_WARNS() << "Couldn't create LL_PATH_CACHE dir " << getExpandedFilename(LL_PATH_CACHE,"") << LL_ENDL;
     3.5  	}
     3.6  
     3.7 -	mCAFile = getExpandedFilename(LL_PATH_APP_SETTINGS, "ca-bundle.crt");
     3.8 +	mCAFile = getExpandedFilename(LL_PATH_EXECUTABLE, "ca-bundle.crt");
     3.9  }
    3.10  
    3.11  U32 LLDir_Solaris::countFilesInDir(const std::string &dirname, const std::string &mask)

mercurial