From 7e405ef0e3efce400db53ddc16d367680da659c9 Mon Sep 17 00:00:00 2001 From: Vadim ProductEngine Date: Mon, 25 Jul 2011 23:46:28 +0300 Subject: STORM-1220 FOLLOWUP Prevent displaying unlocalized sim product name. Removed LLViewerRegion::getSimProductName() so that it doesn't mistakenly get used in UI code, thus causing localization bugs. --- indra/newview/llviewerregion.cpp | 3 +-- indra/newview/llviewerregion.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index c33b39b449..d4e0831c33 100644 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -560,9 +560,8 @@ const std::string LLViewerRegion::getSimAccessString() const std::string LLViewerRegion::getLocalizedSimProductName() const { - const std::string& spn = getSimProductName(); std::string localized_spn; - return LLTrans::findString(localized_spn, spn) ? localized_spn : spn; + return LLTrans::findString(localized_spn, mProductName) ? localized_spn : mProductName; } // static diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h index dbc12f548b..a105ff625d 100644 --- a/indra/newview/llviewerregion.h +++ b/indra/newview/llviewerregion.h @@ -192,7 +192,6 @@ public: S32 getSimCPURatio() const { return mCPURatio; } const std::string& getSimColoName() const { return mColoName; } const std::string& getSimProductSKU() const { return mProductSKU; } - const std::string& getSimProductName() const { return mProductName; } std::string getLocalizedSimProductName() const; // Returns "Sandbox", "Expensive", etc. -- cgit v1.2.3