summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerinventory.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-08-03 14:13:12 -0400
committerOz Linden <oz@lindenlab.com>2011-08-03 14:13:12 -0400
commit299e18e588338d19a40a4b9944e9ddd31216b0c8 (patch)
tree985a3fe37b693cf377c953a880c967f5e29b2abc /indra/newview/llviewerinventory.cpp
parent01ee25cca43b175567859becd1eacf77db24af55 (diff)
parent93099e22897c8650927b0dc90a4a38e2a7cf81d8 (diff)
Automated merge with file:///Users/oz/Work/V-PR
Diffstat (limited to 'indra/newview/llviewerinventory.cpp')
-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;
}