livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
meow-7.2.2
Vadim ProductEngine 2011-07-25 23:46:28 +03:00
parent c645e9e59e
commit 7e405ef0e3
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/llviewerregion.cpp
View File

@ -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

1
indra/newview/llviewerregion.h
View File

@ -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.