Skip to content
Snippets Groups Projects
Commit 127f1e3a authored by Rye Mutt's avatar Rye Mutt :bread:
Browse files

Fix old merge error

parent f60b2825
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/newview/llsechandler_basic.cpp
+ 0
− 2
View file @ 127f1e3a
...@@ -1323,8 +1323,6 @@ void LLSecAPIBasicHandler::init() ...@@ -1323,8 +1323,6 @@ void LLSecAPIBasicHandler::init()
"bin_conf.dat"); "bin_conf.dat");
mLegacyPasswordPath = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "password.dat"); mLegacyPasswordPath = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, "password.dat");
mProtectedDataFilename = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS,
"bin_conf.dat");
std::string store_file = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS, std::string store_file = gDirUtilp->getExpandedFilename(LL_PATH_USER_SETTINGS,
"CA.pem"); "CA.pem");
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment