diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-02-03 15:13:37 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-02-03 15:13:37 +0200 |
| commit | a52ef7ad60c8821fcb412988d838b58c0414ac8f (patch) | |
| tree | a6fe2e267b2e7bf70d4a8d8227e1bc1f1152574d /indra/newview/llstartup.cpp | |
| parent | bc496f5f17a446af27b47cbe227e7e85089bab8d (diff) | |
| parent | 712164210cf57cfde3b17c3162dc4129d52e2780 (diff) | |
Merge branch 'DRTVWR-499' into DRTVWR-500
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) { |