summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerobject.cpp
diff options
context:
space:
mode:
authorVadim ProductEngine <vsavchuk@productengine.com>2011-07-29 05:20:54 +0300
committerVadim ProductEngine <vsavchuk@productengine.com>2011-07-29 05:20:54 +0300
commit9bef7e95d064e1e82467e57df6673b149b77839f (patch)
treef432475a36ab2ed4e8761e0ee3cc933b5c637c5a /indra/newview/llviewerobject.cpp
parent1ba21762926167580c434e955646c986074988a3 (diff)
STORM-1436 FIXED Broken localization of "Contents" and "New Script" items in the Contents tab of Build Tools.
The bug happened when the translations contained non-ASCII characters. Reason: Names of inventory items are limited to ASCII characters. Fix: Leave names in English, localize them when displaying (on the fly). The fix only affects object's inventory (i.e. not agent inventory).
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
-rw-r--r--indra/newview/llviewerobject.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp
index 972993202a..b187fdca6f 100644
--- a/indra/newview/llviewerobject.cpp
+++ b/indra/newview/llviewerobject.cpp
@@ -2660,7 +2660,7 @@ void LLViewerObject::processTaskInv(LLMessageSystem* msg, void** user_data)
LLPointer<LLInventoryObject> obj;
obj = new LLInventoryObject(object->mID, LLUUID::null,
LLAssetType::AT_CATEGORY,
- LLTrans::getString("ViewerObjectContents").c_str());
+ "Contents");
object->mInventory->push_front(obj);
object->doInventoryCallback();
delete ft;
@@ -2727,7 +2727,7 @@ void LLViewerObject::loadTaskInvFile(const std::string& filename)
{
LLPointer<LLInventoryObject> inv = new LLInventoryObject;
inv->importLegacyStream(ifs);
- inv->rename(LLTrans::getString("ViewerObjectContents").c_str());
+ inv->rename("Contents");
mInventory->push_front(inv);
}
else