Merchant Outbox!
Enter: LLFloaterOutbox, floater_merchant_outbox, LLMarketplaceFunctions, LLPanelMarketplaceOutboxInventory, and panel_outbox_inventory
LLView now has childFromPoint() from v-d.
LLInventoryBridge{
Sync includes with v-d.
Let's ENABLE_MERCHANT_SEND_TO_MARKETPLACE_CONTEXT_MENU for ease of access and tweak it to work.
Uncomment related code.
Catch if we're moving objects into the outbox during pasteFromClipboard()
}
LLInventoryPanel: start_folder attribute for inventory_panels, this could be quite useful in the future
Sync LLToolDragAndDrop with Catznip/v-d
Add the outbox to the World menu, since that seems to involve most commerce. Perhaps we should add a menu entry to the outbox itself to open its floater?
Fix the inventory merchant menu entries, thanks Shyotl..
Merchant Outbox Strings!
This commit is contained in:
@@ -893,6 +893,39 @@ LLView* LLView::childrenHandleHover(S32 x, S32 y, MASK mask)
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
LLView* LLView::childFromPoint(S32 x, S32 y, bool recur)
|
||||
{
|
||||
if (!getVisible())
|
||||
return NULL;
|
||||
|
||||
BOOST_FOREACH(LLView* viewp, mChildList)
|
||||
{
|
||||
S32 local_x = x - viewp->getRect().mLeft;
|
||||
S32 local_y = y - viewp->getRect().mBottom;
|
||||
if (!viewp->visibleAndContains(local_x, local_y))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
// Here we've found the first (frontmost) visible child at this level
|
||||
// containing the specified point. Is the caller asking us to drill
|
||||
// down and return the innermost leaf child at this point, or just the
|
||||
// top-level child?
|
||||
if (recur)
|
||||
{
|
||||
LLView* leaf(viewp->childFromPoint(local_x, local_y, recur));
|
||||
// Maybe viewp is already a leaf LLView, or maybe it has children
|
||||
// but this particular (x, y) point falls between them. If the
|
||||
// recursive call returns non-NULL, great, use that; else just use
|
||||
// viewp.
|
||||
return leaf? leaf : viewp;
|
||||
}
|
||||
return viewp;
|
||||
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
BOOL LLView::handleKey(KEY key, MASK mask, BOOL called_from_parent)
|
||||
{
|
||||
BOOL handled = FALSE;
|
||||
|
||||
Reference in New Issue
Block a user