diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-07-29 11:08:00 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-07-29 11:08:00 -0400 |
| commit | b4df9fd2028e39186291a7829234ff3ba0f87cd0 (patch) | |
| tree | 992846ef7668c85b490c5e249d2059f7b23065be /indra/newview/llviewerregion.cpp | |
| parent | 58ff6b5033e514381a3e9e54d0d6fa681dcc1205 (diff) | |
| parent | 7e405ef0e3efce400db53ddc16d367680da659c9 (diff) | |
merge changes for storm-1220
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) |