From 9bef7e95d064e1e82467e57df6673b149b77839f Mon Sep 17 00:00:00 2001 From: Vadim ProductEngine Date: Fri, 29 Jul 2011 05:20:54 +0300 Subject: 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). --- indra/newview/llviewerobject.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'indra/newview/llviewerobject.cpp') 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 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 inv = new LLInventoryObject; inv->importLegacyStream(ifs); - inv->rename(LLTrans::getString("ViewerObjectContents").c_str()); + inv->rename("Contents"); mInventory->push_front(inv); } else -- cgit v1.2.3