diff options
| author | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-07-25 23:46:28 +0300 |
|---|---|---|
| committer | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-07-25 23:46:28 +0300 |
| commit | 7e405ef0e3efce400db53ddc16d367680da659c9 (patch) | |
| tree | 1c70856136f90e787a7ef2d62aa3ffc4f5221c4b | |
| parent | c645e9e59e9e0a83a25f2c782ac79c21d519939e (diff) | |
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.
| -rw-r--r-- | indra/newview/llviewerregion.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/llviewerregion.h | 1 |
2 files changed, 1 insertions, 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. |