diff options
author | Merov Linden <merov@lindenlab.com> | 2013-03-06 18:45:40 -0800 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2013-03-06 18:45:40 -0800 |
commit | 179195241f5579ceeea682d7faf23dc2376338ec (patch) | |
tree | aef237271227a9faccc1414173c7efd6d4c5657a /indra/llvfs/lldir.cpp | |
parent | 4458986cf22a749d3387085a70ea07930519b8ab (diff) | |
parent | 236eefd9c8afbdd1f9e8b32cd8d356a6c0b6b2ac (diff) |
Pull merge from lindenlab/viewer-chui
Diffstat (limited to 'indra/llvfs/lldir.cpp')
-rw-r--r-- | indra/llvfs/lldir.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/llvfs/lldir.cpp b/indra/llvfs/lldir.cpp index f7bc19574a..6899e9a44a 100644 --- a/indra/llvfs/lldir.cpp +++ b/indra/llvfs/lldir.cpp @@ -347,6 +347,11 @@ const std::string &LLDir::getLLPluginDir() const return mLLPluginDir; } +const std::string &LLDir::getUserName() const +{ + return mUserName; +} + static std::string ELLPathToString(ELLPath location) { typedef std::map<ELLPath, const char*> ELLPathMap; |