summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorymodel.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-07-19 10:18:57 -0400
committerLoren Shih <seraph@lindenlab.com>2010-07-19 10:18:57 -0400
commit5b8c1851f2b565fddaab28e23add62f621f15082 (patch)
treed8525d0f5dd985efb86dcb50e752e19d59a7fb2d /indra/newview/llinventorymodel.cpp
parent94fde578cd845b1a648e66ecf184e7a24beaad6d (diff)
parent3bb5d368a21e2645222f0f5fa57b0a0abb236084 (diff)
automated merge
Diffstat (limited to 'indra/newview/llinventorymodel.cpp')
-rw-r--r--indra/newview/llinventorymodel.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index 236ed9bbd1..13e5cb516e 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -1254,6 +1254,9 @@ void LLInventoryModel::addCategory(LLViewerInventoryCategory* category)
//llinfos << "LLInventoryModel::addCategory()" << llendl;
if(category)
{
+ // try to localize default names first. See EXT-8319, EXT-7051.
+ category->localizeName();
+
// Insert category uniquely into the map
mCategoryMap[category->getUUID()] = category; // LLPointer will deref and delete the old one
//mInventory[category->getUUID()] = category;