diff options
| author | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-11-03 14:52:05 -0500 |
|---|---|---|
| committer | Eric M. Tulla (BigPapi) <tulla@lindenlab.com> | 2009-11-03 14:52:05 -0500 |
| commit | e87975284e2b50c81d95bbb9672678ae262288be (patch) | |
| tree | c081cf1087ac2aa055d0e69737f936138578a2c4 /indra/newview/llpanelobjectinventory.cpp | |
| parent | 0dd9871012f50d6201217a79b65bedd28368efae (diff) | |
| parent | 3f8c129a1f4caefcc25c895a6612aaaaa0c6aaa3 (diff) | |
update from viewer2 and merge into avp
--HG--
branch : avatar-pipeline
Diffstat (limited to 'indra/newview/llpanelobjectinventory.cpp')
| -rw-r--r-- | indra/newview/llpanelobjectinventory.cpp | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/indra/newview/llpanelobjectinventory.cpp b/indra/newview/llpanelobjectinventory.cpp index 63fad7ddfd..68181f12b9 100644 --- a/indra/newview/llpanelobjectinventory.cpp +++ b/indra/newview/llpanelobjectinventory.cpp @@ -289,10 +289,24 @@ const std::string& LLTaskInvFVBridge::getName() const const std::string& LLTaskInvFVBridge::getDisplayName() const { LLInventoryItem* item = findItem(); + if(item) { - mDisplayName.assign(item->getName()); - + if(item->getParentUUID().isNull()) + { + if(item->getName() == "Contents") + { + mDisplayName.assign(LLTrans::getString("ViewerObjectContents")); + } + else + { + mDisplayName.assign(item->getName()); + } + } + else + { + mDisplayName.assign(item->getName()); + } const LLPermissions& perm(item->getPermissions()); BOOL copy = gAgent.allowOperation(PERM_COPY, perm, GP_OBJECT_MANIPULATE); BOOL mod = gAgent.allowOperation(PERM_MODIFY, perm, GP_OBJECT_MANIPULATE); @@ -300,15 +314,15 @@ const std::string& LLTaskInvFVBridge::getDisplayName() const if(!copy) { - mDisplayName.append(" (no copy)"); + mDisplayName.append(LLTrans::getString("no_copy")); } if(!mod) { - mDisplayName.append(" (no modify)"); + mDisplayName.append(LLTrans::getString("no_modify")); } if(!xfer) { - mDisplayName.append(" (no transfer)"); + mDisplayName.append(LLTrans::getString("no_transfer")); } } |