diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-08-03 14:13:12 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-08-03 14:13:12 -0400 |
| commit | 299e18e588338d19a40a4b9944e9ddd31216b0c8 (patch) | |
| tree | 985a3fe37b693cf377c953a880c967f5e29b2abc /indra/newview/llviewerregion.cpp | |
| parent | 01ee25cca43b175567859becd1eacf77db24af55 (diff) | |
| parent | 93099e22897c8650927b0dc90a4a38e2a7cf81d8 (diff) | |
Automated merge with file:///Users/oz/Work/V-PR
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
| -rw-r--r-- | indra/newview/llviewerregion.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index bb7170e0f7..d4e0831c33 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -558,6 +558,11 @@ const std::string LLViewerRegion::getSimAccessString() const return accessToString(mSimAccess); } +std::string LLViewerRegion::getLocalizedSimProductName() const +{ + std::string localized_spn; + return LLTrans::findString(localized_spn, mProductName) ? localized_spn : mProductName; +} // static std::string LLViewerRegion::regionFlagsToString(U32 flags) |