diff options
| author | Debi King (Dessie) <dessie@lindenlab.com> | 2011-08-15 12:21:59 -0400 |
|---|---|---|
| committer | Debi King (Dessie) <dessie@lindenlab.com> | 2011-08-15 12:21:59 -0400 |
| commit | 45036820f85844093f3a2031cff10c6633926da4 (patch) | |
| tree | ff20e352f2510e0945e29d2cd9bcba0957968fef /indra/newview/llviewerobject.cpp | |
| parent | 91eb63bdde50d3a75908909af0e23d54f5c2fd21 (diff) | |
| parent | 0bee6c278ca6acd89f33bf0b32a80f1eaded7db4 (diff) | |
merged .hgtags
Diffstat (limited to 'indra/newview/llviewerobject.cpp')
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index b5fdca632b..cd71b6d42a 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -2750,7 +2750,7 @@ void LLViewerObject::processTaskInv(LLMessageSystem* msg, void** user_data) LLPointer<LLInventoryObject> 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; @@ -2817,7 +2817,7 @@ void LLViewerObject::loadTaskInvFile(const std::string& filename) { LLPointer<LLInventoryObject> inv = new LLInventoryObject; inv->importLegacyStream(ifs); - inv->rename(LLTrans::getString("ViewerObjectContents").c_str()); + inv->rename("Contents"); mInventory->push_front(inv); } else |