diff options
| author | Logan Dethrow <log@lindenlab.com> | 2011-08-12 14:24:00 -0400 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2011-08-12 14:24:00 -0400 |
| commit | f73ec6a0378bb31500957e2e9d29ce9c48796831 (patch) | |
| tree | 3dfac26b35957d7ba1f2668f26183544353ce3a5 /indra/newview/llviewerobject.cpp | |
| parent | cff5251f064005f213a905f6eb41b5b7ef8c954b (diff) | |
| parent | a41e149642bba39a5dc9bae01a0ea3e6455f7471 (diff) | |
merge
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 |