Second Life viewer sources 1.21.0-RC

1 files changed, 9 insertions, 9 deletions

diff --git a/linden/indra/llvfs/lldir_solaris.cpp b/linden/indra/llvfs/lldir_solaris.cpp
index 2143bb2..62c1eb7 100644
--- a/linden/indra/llvfs/lldir_solaris.cpp
+++ b/linden/indra/llvfs/lldir_solaris.cpp
@@ -152,8 +152,8 @@ void LLDir_Solaris::initAppDirs(const std::string &app_name)
 {
         mAppName = app_name;
 
-        LLString upper_app_name(app_name);
-        LLString::toUpper(upper_app_name);
+        std::string upper_app_name(app_name);
+        LLStringUtil::toUpper(upper_app_name);
 
         char* app_home_env = getenv((upper_app_name + "_USER_DIR").c_str());    /* Flawfinder: ignore */ 
         if (app_home_env)
@@ -167,14 +167,14 @@ void LLDir_Solaris::initAppDirs(const std::string &app_name)
                 mOSUserAppDir = mOSUserDir;
                 mOSUserAppDir += "/";
                 mOSUserAppDir += ".";
-                LLString lower_app_name(app_name);
-                LLString::toLower(lower_app_name);
+                std::string lower_app_name(app_name);
+                LLStringUtil::toLower(lower_app_name);
                 mOSUserAppDir += lower_app_name;
         }
 
         // create any directories we expect to write to.
 
-        int res = LLFile::mkdir(mOSUserAppDir.c_str());
+        int res = LLFile::mkdir(mOSUserAppDir);
         if (res == -1)
         {
                 if (errno != EEXIST)
@@ -185,7 +185,7 @@ void LLDir_Solaris::initAppDirs(const std::string &app_name)
                 }
         }
 
-        res = LLFile::mkdir(getExpandedFilename(LL_PATH_LOGS,"").c_str());
+        res = LLFile::mkdir(getExpandedFilename(LL_PATH_LOGS,""));
         if (res == -1)
         {
                 if (errno != EEXIST)
@@ -194,7 +194,7 @@ void LLDir_Solaris::initAppDirs(const std::string &app_name)
                 }
         }
         
-        res = LLFile::mkdir(getExpandedFilename(LL_PATH_USER_SETTINGS,"").c_str());
+        res = LLFile::mkdir(getExpandedFilename(LL_PATH_USER_SETTINGS,""));
         if (res == -1)
         {
                 if (errno != EEXIST)
@@ -203,7 +203,7 @@ void LLDir_Solaris::initAppDirs(const std::string &app_name)
                 }
         }
         
-        res = LLFile::mkdir(getExpandedFilename(LL_PATH_CACHE,"").c_str());
+        res = LLFile::mkdir(getExpandedFilename(LL_PATH_CACHE,""));
         if (res == -1)
         {
                 if (errno != EEXIST)
@@ -212,7 +212,7 @@ void LLDir_Solaris::initAppDirs(const std::string &app_name)
                 }
         }
         
-        res = LLFile::mkdir(getExpandedFilename(LL_PATH_MOZILLA_PROFILE,"").c_str());
+        res = LLFile::mkdir(getExpandedFilename(LL_PATH_MOZILLA_PROFILE,""));
         if (res == -1)
         {
                 if (errno != EEXIST)