diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2020-11-13 15:45:39 +0200 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2020-11-13 15:45:39 +0200 |
| commit | 2d84f8f6c89e0a3f0d4f692e6280eb53500d6393 (patch) | |
| tree | 33dfa0a1d12d2acf32756b704b06e0e859a364f5 /indra/newview/llviewerregion.cpp | |
| parent | 674f12f681c4b405400194a35496a8e1ff77b3e5 (diff) | |
SL-14312 Show simulator host names for AWS hosted regions
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
| -rw-r--r-- | indra/newview/llviewerregion.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index 6ccf38cd27..2fde4fe49c 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -3361,5 +3361,12 @@ U32 LLViewerRegion::getMaxMaterialsPerTransaction() const return max_entries; } - +std::string LLViewerRegion::getSimHostName() +{ + if (mSimulatorFeaturesReceived) + { + return mSimulatorFeatures.has("HostName") ? mSimulatorFeatures["HostName"].asString() : getHost().getHostName(); + } + return std::string("..."); +} |