Merged MAINT-8297 Mac fix

Fri, 02 Mar 2018 18:31:05 +0200

author
AndreyL ProductEngine <alihatskiy@productengine.com>
date
Fri, 02 Mar 2018 18:31:05 +0200
changeset 55323
29d6fbc0f354
parent 55313
e817ee85d86a
parent 55322
c58c9ae2547c
child 55324
b968bfa33629

Merged MAINT-8297 Mac fix

     1.1 --- a/indra/llvfs/lldir_mac.cpp	Fri Mar 02 00:30:35 2018 +0200
     1.2 +++ b/indra/llvfs/lldir_mac.cpp	Fri Mar 02 18:31:05 2018 +0200
     1.3 @@ -173,7 +173,7 @@
     1.4  		mAppRODataDir = app_read_only_data_dir;
     1.5  		mSkinBaseDir = mAppRODataDir + mDirDelimiter + "skins";
     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  std::string LLDir_Mac::getCurPath()

mercurial