diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-08-09 10:20:41 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-08-09 10:20:41 -0400 |
| commit | 4ff281ab946780c4ebefc9127372806746dc2b33 (patch) | |
| tree | 56564e30b819f568d6f8421253f2a9192a79539d /indra/newview/llviewerobject.cpp | |
| parent | f8c6283f4c7917bf467c65c05608216fb9dd5b5f (diff) | |
| parent | 9bef7e95d064e1e82467e57df6673b149b77839f (diff) | |
merge changes for storm-1436
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 |