Merge with develop

--HG--
branch : compatibility-develop

code/ryzom/client/src/client_cfg.cpp

@@ -2213,6 +2213,7 @@ bool CClientConfig::getDefaultConfigLocation(std::string& p_name) const
 #endif
 
 	std::string currentPath = CPath::standardizePath(CPath::getCurrentPath());
+	std::string etcPath = CPath::standardizePath(getRyzomEtcPrefix());
 
 	// look in the current working directory first
 	if (CFile::isExists(currentPath + defaultConfigFileName))
@@ -2222,13 +2223,14 @@ bool CClientConfig::getDefaultConfigLocation(std::string& p_name) const
 	else if (CFile::isExists(Args.getStartupPath() + defaultConfigFileName))
 		p_name = Args.getStartupPath() + defaultConfigFileName;
 
-	// look in prefix path
+	// look in application directory
 	else if (CFile::isExists(defaultConfigPath + defaultConfigFileName))
 		p_name = defaultConfigPath + defaultConfigFileName;
 
-	// if some client_default.cfg was found return true
+	// look in etc prefix path
-	if (p_name.size())
+	else if (!etcPath.empty() && CFile::isExists(etcPath + defaultConfigFileName))
-		return true;
+		p_name = etcPath + defaultConfigFileName;
 
-	return false;
+	// if some client_default.cfg was found return true
+	return !p_name.empty();
 }