From a500cd62ecf35ae853687c45118109269e0e5383 Mon Sep 17 00:00:00 2001 From: Mnikolenko ProductEngine Date: Tue, 25 Nov 2014 12:06:13 +0200 Subject: MAINT-4691 Restored price labels in Object profile panel --- indra/newview/llsidepaneltaskinfo.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'indra/newview/llsidepaneltaskinfo.cpp') diff --git a/indra/newview/llsidepaneltaskinfo.cpp b/indra/newview/llsidepaneltaskinfo.cpp index 636654ad23..58c3683459 100755 --- a/indra/newview/llsidepaneltaskinfo.cpp +++ b/indra/newview/llsidepaneltaskinfo.cpp @@ -502,11 +502,11 @@ void LLSidepanelTaskInfo::refresh() // If there are multiple items for sale then set text to PRICE PER UNIT. if (num_for_sale > 1) { - getChild("Cost")->setValue(getString("Cost Per Unit")); + getChild("Edit Cost")->setLabel(getString("Cost Per Unit")); } else { - getChild("Cost")->setValue(getString("Cost Default")); + getChild("Edit Cost")->setLabel(getString("Cost Default")); } LLSpinCtrl *edit_price = getChild("Edit Cost"); @@ -547,16 +547,15 @@ void LLSidepanelTaskInfo::refresh() // If multiple items are for sale, set text to TOTAL PRICE. if (num_for_sale > 1) - getChild("Cost")->setValue(getString("Cost Total")); + getChild("Edit Cost")->setLabel(getString("Cost Total")); else - getChild("Cost")->setValue(getString("Cost Default")); + getChild("Edit Cost")->setLabel(getString("Cost Default")); } // This is a public object. else { getChildView("Cost")->setEnabled(FALSE); - getChild("Cost")->setValue(getString("Cost Default")); - + getChild("Edit Cost")->setLabel(getString("Cost Default")); getChild("Edit Cost")->setValue(LLStringUtil::null); getChildView("Edit Cost")->setEnabled(FALSE); } -- cgit v1.2.3 From b07bfba19810e4275d9631e067381d501245a276 Mon Sep 17 00:00:00 2001 From: Mnikolenko ProductEngine Date: Wed, 26 Nov 2014 13:32:43 +0200 Subject: MAINT-4691 FIXED Changed text labels --- indra/newview/llsidepaneltaskinfo.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'indra/newview/llsidepaneltaskinfo.cpp') diff --git a/indra/newview/llsidepaneltaskinfo.cpp b/indra/newview/llsidepaneltaskinfo.cpp index 58c3683459..17ecfab4fb 100755 --- a/indra/newview/llsidepaneltaskinfo.cpp +++ b/indra/newview/llsidepaneltaskinfo.cpp @@ -499,17 +499,19 @@ void LLSidepanelTaskInfo::refresh() // You own these objects. else if (self_owned || (group_owned && gAgent.hasPowerInGroup(group_id,GP_OBJECT_SET_SALE))) { + LLSpinCtrl *edit_price = getChild("Edit Cost"); + // If there are multiple items for sale then set text to PRICE PER UNIT. if (num_for_sale > 1) { - getChild("Edit Cost")->setLabel(getString("Cost Per Unit")); + std::string label_text = is_sale_price_mixed? "Cost Mixed" :"Cost Per Unit"; + edit_price->setLabel(getString(label_text)); } else { - getChild("Edit Cost")->setLabel(getString("Cost Default")); + edit_price->setLabel(getString("Cost Default")); } - LLSpinCtrl *edit_price = getChild("Edit Cost"); if (!edit_price->hasFocus()) { // If the sale price is mixed then set the cost to MIXED, otherwise -- cgit v1.2.3