diff options
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llsidepaneliteminfo.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llviewermessage.cpp | 7 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/sidepanel_item_info.xml | 4 |
3 files changed, 11 insertions, 4 deletions
diff --git a/indra/newview/llsidepaneliteminfo.cpp b/indra/newview/llsidepaneliteminfo.cpp index fabb80ab02..9373ff0d18 100644 --- a/indra/newview/llsidepaneliteminfo.cpp +++ b/indra/newview/llsidepaneliteminfo.cpp @@ -288,7 +288,7 @@ void LLSidepanelItemInfo::refreshFromItem(LLViewerInventoryItem* item) LLSLURL("agent", creator_id, "completename").getSLURLString(); childSetEnabled("BtnCreator",TRUE); childSetEnabled("LabelCreatorTitle",TRUE); - childSetEnabled("LabelCreatorName",TRUE); + childSetEnabled("LabelCreatorName",FALSE); childSetText("LabelCreatorName",name); } else @@ -316,7 +316,7 @@ void LLSidepanelItemInfo::refreshFromItem(LLViewerInventoryItem* item) } childSetEnabled("BtnOwner",TRUE); childSetEnabled("LabelOwnerTitle",TRUE); - childSetEnabled("LabelOwnerName",TRUE); + childSetEnabled("LabelOwnerName",FALSE); childSetText("LabelOwnerName",name); } else diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index 21ba38ecfc..ccd2f6ea0e 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -4948,6 +4948,13 @@ static std::string reason_from_transaction_type(S32 transaction_type, case TRANS_UPLOAD_CHARGE: return LLTrans::getString("to upload"); + // These have no reason to display, but are expected and should not + // generate warnings + case TRANS_GIFT: + case TRANS_PAY_OBJECT: + case TRANS_OBJECT_PAYS: + return std::string(); + default: llwarns << "Unknown transaction type " << transaction_type << llendl; diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml index b840fdd31b..713aaa21a9 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml @@ -156,7 +156,7 @@ left_pad="5" name="LabelCreatorName" top_delta="6" - width="140"> + width="180"> Nicole Linden </text> <button @@ -199,7 +199,7 @@ left_pad="5" name="LabelOwnerName" top_delta="6" - width="140"> + width="180"> Thrax Linden </text> <button |