From 8fa1dc90a9fec493b19604a4b4e08dc3208c7e8f Mon Sep 17 00:00:00 2001 From: David Seikel Date: Fri, 25 Feb 2011 05:58:41 +1000 Subject: Unbranding. Todays word is "linden". --- linden/indra/llvfs/lldir.cpp | 30 +++++++++++++++--------------- linden/indra/llvfs/lldir.h | 6 +++--- linden/indra/llvfs/lldir_linux.cpp | 2 +- linden/indra/llvfs/lldir_solaris.cpp | 2 +- 4 files changed, 20 insertions(+), 20 deletions(-) (limited to 'linden/indra/llvfs') diff --git a/linden/indra/llvfs/lldir.cpp b/linden/indra/llvfs/lldir.cpp index 81de54f..8bd68f4 100644 --- a/linden/indra/llvfs/lldir.cpp +++ b/linden/indra/llvfs/lldir.cpp @@ -69,7 +69,7 @@ LLDir::LLDir() mAppRODataDir(""), mOSUserDir(""), mOSUserAppDir(""), - mLindenUserDir(""), + mViewerUserDir(""), mOSCacheDir(""), mCAFile(""), mTempDir(""), @@ -193,10 +193,10 @@ const std::string &LLDir::getOSUserAppDir() const return mOSUserAppDir; } -const std::string &LLDir::getLindenUserDir(bool empty_ok) const +const std::string &LLDir::getViewerUserDir(bool empty_ok) const { - llassert(empty_ok || !mLindenUserDir.empty()); - return mLindenUserDir; + llassert(empty_ok || !mViewerUserDir.empty()); + return mViewerUserDir; } const std::string &LLDir::getChatLogsDir() const @@ -353,7 +353,7 @@ std::string LLDir::getExpandedFilename(ELLPath location, const std::string& subd break; case LL_PATH_PER_SL_ACCOUNT: - prefix = getLindenUserDir(); + prefix = getViewerUserDir(); break; case LL_PATH_CHAT_LOGS: @@ -543,7 +543,7 @@ std::string LLDir::getForbiddenFileChars() return "\\/:*?\"<>|"; } -void LLDir::setLindenUserDir(const std::string &grid, const std::string &first, const std::string &last) +void LLDir::setViewerUserDir(const std::string &grid, const std::string &first, const std::string &last) { // if both first and last aren't set, assume we're grabbing the cached dir if (!first.empty() && !last.empty()) @@ -554,23 +554,23 @@ void LLDir::setLindenUserDir(const std::string &grid, const std::string &first, LLStringUtil::toLower(firstlower); std::string lastlower(last); LLStringUtil::toLower(lastlower); - mLindenUserDir = getOSUserAppDir(); - mLindenUserDir += mDirDelimiter; - mLindenUserDir += firstlower; - mLindenUserDir += "_"; - mLindenUserDir += lastlower; + mViewerUserDir = getOSUserAppDir(); + mViewerUserDir += mDirDelimiter; + mViewerUserDir += firstlower; + mViewerUserDir += "_"; + mViewerUserDir += lastlower; if (!grid.empty()) { std::string gridlower(grid); LLStringUtil::toLower(gridlower); - mLindenUserDir += "@"; - mLindenUserDir += gridlower; + mViewerUserDir += "@"; + mViewerUserDir += gridlower; } } else { - llerrs << "Invalid name for LLDir::setLindenUserDir" << llendl; + llerrs << "Invalid name for LLDir::setViewerUserDir" << llendl; } dumpCurrentDirectories(); @@ -679,7 +679,7 @@ void LLDir::dumpCurrentDirectories() LL_DEBUGS2("AppInit","Directories") << " AppRODataDir: " << getAppRODataDir() << LL_ENDL; LL_DEBUGS2("AppInit","Directories") << " OSUserDir: " << getOSUserDir() << LL_ENDL; LL_DEBUGS2("AppInit","Directories") << " OSUserAppDir: " << getOSUserAppDir() << LL_ENDL; - LL_DEBUGS2("AppInit","Directories") << " LindenUserDir: " << getLindenUserDir() << LL_ENDL; + LL_DEBUGS2("AppInit","Directories") << " ViewerUserDir: " << getViewerUserDir() << LL_ENDL; LL_DEBUGS2("AppInit","Directories") << " TempDir: " << getTempDir() << LL_ENDL; LL_DEBUGS2("AppInit","Directories") << " CAFile: " << getCAFile() << LL_ENDL; LL_DEBUGS2("AppInit","Directories") << " SkinDir: " << getSkinDir() << LL_ENDL; diff --git a/linden/indra/llvfs/lldir.h b/linden/indra/llvfs/lldir.h index 8f8ac77..1a0c6cc 100644 --- a/linden/indra/llvfs/lldir.h +++ b/linden/indra/llvfs/lldir.h @@ -92,7 +92,7 @@ class LLDir const std::string &getAppRODataDir() const; // Location of read-only data files const std::string &getOSUserDir() const; // Location of the os-specific user dir const std::string &getOSUserAppDir() const; // Location of the os-specific user app dir - const std::string &getLindenUserDir(bool empty_ok = false) const; // Location of the Linden user dir. + const std::string &getViewerUserDir(bool empty_ok = false) const; // Location of the viewer user dir. const std::string &getChatLogsDir() const; // Location of the chat logs dir. const std::string &getPerAccountChatLogsDir() const; // Location of the per account chat logs dir. const std::string &getTempDir() const; // Common temporary directory @@ -131,7 +131,7 @@ class LLDir virtual void setChatLogsDir(const std::string &path); // Set the chat logs dir to this user's dir virtual void setPerAccountChatLogsDir(const std::string &grid, const std::string &first, const std::string &last); // Set the per user chat log directory. - virtual void setLindenUserDir(const std::string &grid, const std::string &first, const std::string &last); // Set the linden user dir to this user's dir + virtual void setViewerUserDir(const std::string &grid, const std::string &first, const std::string &last); // Set the viewer user dir to this user's dir virtual void setSkinFolder(const std::string &skin_folder); virtual bool setCacheDir(const std::string &path); @@ -149,7 +149,7 @@ protected: std::string mAppRODataDir; // Location for static app data std::string mOSUserDir; // OS Specific user directory std::string mOSUserAppDir; // OS Specific user app directory - std::string mLindenUserDir; // Location for Linden user-specific data + std::string mViewerUserDir; // Location for Viewer user-specific data std::string mPerAccountChatLogsDir; // Location for chat logs. std::string mChatLogsDir; // Location for chat logs. std::string mCAFile; // Location of the TLS certificate authority PEM file. diff --git a/linden/indra/llvfs/lldir_linux.cpp b/linden/indra/llvfs/lldir_linux.cpp index 5f1eabb..84fd4bd 100644 --- a/linden/indra/llvfs/lldir_linux.cpp +++ b/linden/indra/llvfs/lldir_linux.cpp @@ -97,7 +97,7 @@ LLDir_Linux::LLDir_Linux() mAppRODataDir = tmp_str; mOSUserDir = getCurrentUserHome(tmp_str); mOSUserAppDir = ""; - mLindenUserDir = ""; + mViewerUserDir = ""; char path [32]; /* Flawfinder: ignore */ diff --git a/linden/indra/llvfs/lldir_solaris.cpp b/linden/indra/llvfs/lldir_solaris.cpp index 5132455..34c14a5 100644 --- a/linden/indra/llvfs/lldir_solaris.cpp +++ b/linden/indra/llvfs/lldir_solaris.cpp @@ -100,7 +100,7 @@ LLDir_Solaris::LLDir_Solaris() mAppRODataDir = strdup(tmp_str); mOSUserDir = getCurrentUserHome(tmp_str); mOSUserAppDir = ""; - mLindenUserDir = ""; + mViewerUserDir = ""; char path [LL_MAX_PATH]; /* Flawfinder: ignore */ -- cgit v1.1