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

viewer-private#240 Restore missing marketplace notification

meow-7.2.2
Andrey Kleshchev 2024-05-23 15:55:45 +03:00 committed by Andrey Kleshchev
parent b052240a50
commit e0f5606db3
6 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
indra/llui/llfolderviewitem.cpp
View File

@ -31,11 +31,12 @@
#include "llfolderviewitem.h"
#include "llfolderview.h"
#include "llfolderviewmodel.h"
#include "llpanel.h"
#include "llcallbacklist.h"
#include "llcriticaldamp.h"
#include "llclipboard.h"
#include "llfocusmgr.h" // gFocusMgr
#include "llnotificationsutil.h"
#include "llpanel.h"
#include "lltrans.h"
#include "llwindow.h"
@ -105,7 +106,7 @@ LLFolderViewItem::Params::Params()
item_height("item_height"),
item_top_pad("item_top_pad"),
creation_date(),
allow_wear("allow_wear", true),
marketplace_item("marketplace_item", false),
allow_drop("allow_drop", true),
font_color("font_color"),
font_highlight_color("font_highlight_color"),
@ -144,7 +145,7 @@ LLFolderViewItem::LLFolderViewItem(const LLFolderViewItem::Params& p)
mRoot(p.root),
mViewModelItem(p.listener),
mIsMouseOverTitle(false),
mAllowWear(p.allow_wear),
mMarketplaceItem(p.marketplace_item),
mAllowDrop(p.allow_drop),
mFontColor(p.font_color),
mFontHighlightColor(p.font_highlight_color),
@ -533,10 +534,15 @@ void LLFolderViewItem::buildContextMenu(LLMenuGL& menu, U32 flags)
void LLFolderViewItem::openItem( void )
{
if (mAllowWear || !getViewModelItem()->isItemWearable())
if (!mMarketplaceItem || !getViewModelItem()->isItemWearable())
{
getViewModelItem()->openItem();
}
else if (mMarketplaceItem)
{
// Wearing an object from any listing, active or not, is verbotten
LLNotificationsUtil::add("AlertMerchantListingCannotWear");
}
}
void LLFolderViewItem::rename(const std::string& new_name)

4
indra/llui/llfolderviewitem.h
View File

@ -59,7 +59,7 @@ public:
item_top_pad;
Optional<time_t> creation_date;
Optional<bool> allow_wear;
Optional<bool> marketplace_item;
Optional<bool> allow_drop;
Optional<LLUIColor> font_color;
@ -121,7 +121,7 @@ protected:
mIsCurSelection,
mDragAndDropTarget,
mIsMouseOverTitle,
mAllowWear,
mMarketplaceItem,
mAllowDrop,
mSingleFolderMode,
mDoubleClickOverride,

2
indra/newview/skins/default/xui/en/panel_marketplace_listings_inventory.xml
View File

@ -21,5 +21,5 @@
border="false"
bevel_style="none"
show_item_link_overlays="true">
<item allow_wear="false"/>
<item marketplace_item="true"/>
</inventory_panel>

2
indra/newview/skins/default/xui/en/panel_marketplace_listings_listed.xml
View File

@ -20,5 +20,5 @@
border="false"
bevel_style="none"
show_item_link_overlays="true">
<item allow_wear="false"/>
<item marketplace_item="true"/>
</inventory_panel>

2
indra/newview/skins/default/xui/en/panel_marketplace_listings_unassociated.xml
View File

@ -19,5 +19,5 @@
border="false"
bevel_style="none"
show_item_link_overlays="true">
<item allow_wear="false"/>
<item marketplace_item="true"/>
</inventory_panel>

2
indra/newview/skins/default/xui/en/panel_marketplace_listings_unlisted.xml
View File

@ -20,5 +20,5 @@
border="false"
bevel_style="none"
show_item_link_overlays="true">
<item allow_wear="false"/>
<item marketplace_item="true"/>
</inventory_panel>