From 127f1e3a20aef3de67b0f22c5c8ba3b82e17c7d7 Mon Sep 17 00:00:00 2001
From: Rye Mutt <rye@alchemyviewer.org>
Date: Mon, 9 May 2022 02:35:24 -0400
Subject: [PATCH] Fix old merge error

---
 indra/newview/llsechandler_basic.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/indra/newview/llsechandler_basic.cpp b/indra/newview/llsechandler_basic.cpp
index d28a9efc76e..f739bbedb33 100644
--- a/indra/newview/llsechandler_basic.cpp
+++ b/indra/newview/llsechandler_basic.cpp
@@ -1323,8 +1323,6 @@ void LLSecAPIBasicHandler::init()
 															"bin_conf.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,
 														"CA.pem");
 		
-- 
GitLab