diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-01-28 21:42:31 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-01-28 21:42:31 +0200 |
| commit | b304adc02e518a0ba8c5feae642b656c53cbc44a (patch) | |
| tree | 9a3a84bce34fcaaaf74182bdb64c238e1f193e4e /indra/newview/llstartup.cpp | |
| parent | f89c9e9b20a13acd8f6af76699259cab4c74d5db (diff) | |
| parent | 9a3f1f6a3c4506ae08c7af7f92f11da40d80ef00 (diff) | |
Merge branch 'master' into DRTVWR-499
Diffstat (limited to 'indra/newview/llstartup.cpp')
| -rw-r--r-- | indra/newview/llstartup.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 08012686f9..684d3bd421 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -2715,6 +2715,15 @@ std::string& LLStartUp::getInitialOutfitName() return sInitialOutfit; } +std::string LLStartUp::getUserId() +{ + if (gUserCredential.isNull()) + { + return ""; + } + return gUserCredential->userID(); +} + // Loads a bitmap to display during load void init_start_screen(S32 location_id) { |