diff options
Diffstat (limited to 'indra/llvfs')
| -rw-r--r-- | indra/llvfs/lldir.cpp | 6 | ||||
| -rw-r--r-- | indra/llvfs/lldir_win32.cpp | 8 | 
2 files changed, 1 insertions, 13 deletions
| diff --git a/indra/llvfs/lldir.cpp b/indra/llvfs/lldir.cpp index 1179180da2..64556bcb4c 100644 --- a/indra/llvfs/lldir.cpp +++ b/indra/llvfs/lldir.cpp @@ -382,11 +382,7 @@ std::string LLDir::getExpandedFilename(ELLPath location, const std::string& subd  		break;  	case LL_PATH_USER_SKIN: -		prefix = getOSUserAppDir(); -		prefix += mDirDelimiter; -		prefix += "user_settings"; -		prefix += mDirDelimiter; -		prefix += "skins"; +		prefix = getUserSkinDir();  		break;  	case LL_PATH_SKINS: diff --git a/indra/llvfs/lldir_win32.cpp b/indra/llvfs/lldir_win32.cpp index 4a8526cc96..33718e520d 100644 --- a/indra/llvfs/lldir_win32.cpp +++ b/indra/llvfs/lldir_win32.cpp @@ -206,14 +206,6 @@ void LLDir_Win32::initAppDirs(const std::string &app_name,  		}  	} -	res = LLFile::mkdir(getExpandedFilename(LL_PATH_USER_SKIN,"")); -	if (res == -1) -	{ -		if (errno != EEXIST) -		{ -			llwarns << "Couldn't create LL_PATH_SKINS dir " << getExpandedFilename(LL_PATH_USER_SKIN,"") << llendl; -		} -	}  	mCAFile = getExpandedFilename(LL_PATH_APP_SETTINGS, "CA.pem");  } | 
