diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-04-28 13:37:21 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-04-28 13:37:21 -0400 |
commit | 29e1804139691229a887144b612f147e1c9dcffb (patch) | |
tree | ef7b33360da228b7f2e078dbea5af763c1548230 /indra/newview/llwearablelist.cpp | |
parent | 26d324a2dd06ebde896f7856622a55414eb75d77 (diff) | |
parent | 96df3f3eb1351973d140ba73b507de44b1052c89 (diff) |
automated merge
Diffstat (limited to 'indra/newview/llwearablelist.cpp')
-rw-r--r-- | indra/newview/llwearablelist.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/newview/llwearablelist.cpp b/indra/newview/llwearablelist.cpp index b2de31218b..20266706da 100644 --- a/indra/newview/llwearablelist.cpp +++ b/indra/newview/llwearablelist.cpp @@ -235,9 +235,7 @@ LLWearable* LLWearableList::createNewWearable( EWearableType type ) LLWearable *wearable = generateNewWearable(); wearable->setType( type ); - LLSD item_name = LLSD().with("[WEARABLE_ITEM]", wearable->getTypeLabel()); - std::string name = LLTrans::getString("NewWearable"); - LLStringUtil::format(name, item_name); + std::string name = LLTrans::getString( LLWearableDictionary::getTypeDefaultNewName(wearable->getType()) ); wearable->setName( name ); LLPermissions perm; |