diff options
Diffstat (limited to 'indra/llvfs')
| -rw-r--r-- | indra/llvfs/lldir.cpp | 6 | ||||
| -rw-r--r-- | indra/llvfs/lldir.h | 4 | ||||
| -rw-r--r-- | indra/llvfs/lldir_linux.cpp | 9 | ||||
| -rw-r--r-- | indra/llvfs/lldir_solaris.cpp | 9 | ||||
| -rw-r--r-- | indra/llvfs/lldir_win32.cpp | 8 | 
5 files changed, 1 insertions, 35 deletions
| diff --git a/indra/llvfs/lldir.cpp b/indra/llvfs/lldir.cpp index c0c6e592d5..b2b17fdd56 100644 --- a/indra/llvfs/lldir.cpp +++ b/indra/llvfs/lldir.cpp @@ -394,12 +394,6 @@ std::string LLDir::getExpandedFilename(ELLPath location, const std::string& subd  		prefix += "local_assets";  		break; -	case LL_PATH_MOZILLA_PROFILE: -		prefix = getOSUserAppDir(); -		prefix += mDirDelimiter; -		prefix += "browser_profile"; -		break; -  	case LL_PATH_EXECUTABLE:  		prefix = getExecutableDir();  		break; diff --git a/indra/llvfs/lldir.h b/indra/llvfs/lldir.h index 07c814769e..206e3223e3 100644 --- a/indra/llvfs/lldir.h +++ b/indra/llvfs/lldir.h @@ -38,7 +38,7 @@  #define MAX_PATH MAXPATHLEN  #endif -// these numbers *may* get serialized, so we need to be explicit +// these numbers *may* get serialized (really??), so we need to be explicit  typedef enum ELLPath  {  	LL_PATH_NONE = 0, @@ -54,10 +54,8 @@ typedef enum ELLPath  	LL_PATH_TOP_SKIN = 10,  	LL_PATH_CHAT_LOGS = 11,  	LL_PATH_PER_ACCOUNT_CHAT_LOGS = 12, -	LL_PATH_MOZILLA_PROFILE = 13,  	LL_PATH_USER_SKIN = 14,  	LL_PATH_LOCAL_ASSETS = 15, -//	LL_PATH_HTML = 16,  	LL_PATH_EXECUTABLE = 16,  	LL_PATH_DEFAULT_SKIN = 17,  	LL_PATH_FONTS = 18, diff --git a/indra/llvfs/lldir_linux.cpp b/indra/llvfs/lldir_linux.cpp index 08c993ed2a..ee902d1de7 100644 --- a/indra/llvfs/lldir_linux.cpp +++ b/indra/llvfs/lldir_linux.cpp @@ -225,15 +225,6 @@ void LLDir_Linux::initAppDirs(const std::string &app_name,  		}  	} -	res = LLFile::mkdir(getExpandedFilename(LL_PATH_MOZILLA_PROFILE,"")); -	if (res == -1) -	{ -		if (errno != EEXIST) -		{ -			llwarns << "Couldn't create LL_PATH_MOZILLA_PROFILE dir " << getExpandedFilename(LL_PATH_MOZILLA_PROFILE,"") << llendl; -		} -	} -  	mCAFile = getExpandedFilename(LL_PATH_APP_SETTINGS, "CA.pem");  } diff --git a/indra/llvfs/lldir_solaris.cpp b/indra/llvfs/lldir_solaris.cpp index a21f3ca0ab..a8fad8e5bd 100644 --- a/indra/llvfs/lldir_solaris.cpp +++ b/indra/llvfs/lldir_solaris.cpp @@ -244,15 +244,6 @@ void LLDir_Solaris::initAppDirs(const std::string &app_name,  		}  	} -	res = LLFile::mkdir(getExpandedFilename(LL_PATH_MOZILLA_PROFILE,"")); -	if (res == -1) -	{ -		if (errno != EEXIST) -		{ -			llwarns << "Couldn't create LL_PATH_MOZILLA_PROFILE dir " << getExpandedFilename(LL_PATH_MOZILLA_PROFILE,"") << llendl; -		} -	} -  	mCAFile = getExpandedFilename(LL_PATH_APP_SETTINGS, "CA.pem");  } diff --git a/indra/llvfs/lldir_win32.cpp b/indra/llvfs/lldir_win32.cpp index 4c376f11a5..4eb10c842b 100644 --- a/indra/llvfs/lldir_win32.cpp +++ b/indra/llvfs/lldir_win32.cpp @@ -212,14 +212,6 @@ void LLDir_Win32::initAppDirs(const std::string &app_name,  		}  	} -	res = LLFile::mkdir(getExpandedFilename(LL_PATH_MOZILLA_PROFILE,"")); -	if (res == -1) -	{ -		if (errno != EEXIST) -		{ -			llwarns << "Couldn't create LL_PATH_MOZILLA_PROFILE dir " << getExpandedFilename(LL_PATH_MOZILLA_PROFILE,"") << llendl; -		} -	}  	res = LLFile::mkdir(getExpandedFilename(LL_PATH_USER_SKIN,""));  	if (res == -1)  	{ | 
