diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-03-05 17:51:10 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-03-05 17:51:10 -0500 |
| commit | d348deb7049cbaef7c228000525c7ee5a265464c (patch) | |
| tree | 810010b25bc5f0ba4511b40752f5f9ca7cb59b06 /indra/llvfs/lldir.cpp | |
| parent | f7100331ebc7913d7117501ccac86f93f4ffb0e3 (diff) | |
| parent | 55b2383f51ffabf7e95595df5d576f383d458ee1 (diff) | |
merge changes for 3.5.0-beta2
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; |