summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-07-29 11:09:19 -0400
committerOz Linden <oz@lindenlab.com>2011-07-29 11:09:19 -0400
commit59535e71c126aa23551c19db16baf2676afa86bd (patch)
tree92bd38b858645ba25c7d57688da0bf66f9360184 /indra/newview
parent0732d383d05061f03d3d66acee82a1c9d27ab9d1 (diff)
parenta1b99c4821949c41a735e55eec01126d7e77fb17 (diff)
merge changes for storm-1291
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llviewerinventory.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp
index 22666cec0d..c532346e6b 100644
--- a/indra/newview/llviewerinventory.cpp
+++ b/indra/newview/llviewerinventory.cpp
@@ -418,6 +418,9 @@ void LLViewerInventoryItem::fetchFromServer(void) const
BOOL LLViewerInventoryItem::unpackMessage(LLSD item)
{
BOOL rv = LLInventoryItem::fromLLSD(item);
+
+ LLLocalizedInventoryItemsDictionary::getInstance()->localizeInventoryObjectName(mName);
+
mIsComplete = TRUE;
return rv;
}