livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-5273: Change default click action to buy only for modifiable objects

master
Ansariel 2018-07-20 00:06:04 +02:00
parent 0880cdacdc
commit 246d2956d4
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
indra/newview/llpanelpermissions.cpp
View File

@ -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;
// <FS:Ansariel> 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;
// </FS:Ansariel>
LLSelectMgr::getInstance()->selectionSetClickAction(new_click_action);
}