summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerregion.cpp
diff options
context:
space:
mode:
authorNyx (Neal Orman) <nyx@lindenlab.com>2011-08-02 17:19:09 -0400
committerNyx (Neal Orman) <nyx@lindenlab.com>2011-08-02 17:19:09 -0400
commitc7b2a88875e21f7610dd3e7c5d3f528b28d5ab55 (patch)
treea4408b6bdfed37a95f69e16dcab17673cefb6f32 /indra/newview/llviewerregion.cpp
parent9883c33993f7a548c876b43494ffd5835473a211 (diff)
parent9eb555bbe60e0f388593c489d6c473e4adcbd956 (diff)
pulling latest viewer-development into mesh merge branch.
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
-rw-r--r--indra/newview/llviewerregion.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index 5be2234ec2..db2dc531db 100644
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -567,6 +567,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)