From 246d2956d45af98ee7eb4c1309d7d1cf68b4694b Mon Sep 17 00:00:00 2001 From: Ansariel Date: Fri, 20 Jul 2018 00:06:04 +0200 Subject: [PATCH] FIRE-5273: Change default click action to buy only for modifiable objects --- indra/newview/llpanelpermissions.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/indra/newview/llpanelpermissions.cpp b/indra/newview/llpanelpermissions.cpp index 9b586381a4..ed09970f0f 100644 --- a/indra/newview/llpanelpermissions.cpp +++ b/indra/newview/llpanelpermissions.cpp @@ -1445,7 +1445,18 @@ void LLPanelPermissions::setAllSaleInfo() if (default_actions && old_sale_info.isForSale() != new_sale_info.isForSale()) { - U8 new_click_action = new_sale_info.isForSale() ? CLICK_ACTION_BUY : CLICK_ACTION_TOUCH; + // FIRE-5273: Change default click action to buy only for modifiable objects + //U8 new_click_action = new_sale_info.isForSale() ? CLICK_ACTION_BUY : CLICK_ACTION_TOUCH; + struct f : public LLSelectedObjectFunctor + { + virtual bool apply(LLViewerObject* object) + { + return object->permModify(); + } + } modify_checks; + bool allow_modify = LLSelectMgr::getInstance()->getSelection()->applyToObjects(&modify_checks); + U8 new_click_action = (new_sale_info.isForSale() && allow_modify) ? CLICK_ACTION_BUY : CLICK_ACTION_TOUCH; + // LLSelectMgr::getInstance()->selectionSetClickAction(new_click_action); }