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:
@@ -51,7 +51,7 @@
|
||||
#include "llagentwearables.h"
|
||||
#include "llwindow.h"
|
||||
#include "llviewerstats.h"
|
||||
//#include "llmarketplacefunctions.h"
|
||||
#include "llmarketplacefunctions.h"
|
||||
#include "llmarketplacenotifications.h"
|
||||
#include "llmd5.h"
|
||||
#include "llmeshrepository.h"
|
||||
@@ -4090,7 +4090,7 @@ void LLAppViewer::idle()
|
||||
LLViewerMediaFocus::getInstance()->update();
|
||||
|
||||
// Update marketplace
|
||||
//LLMarketplaceInventoryImporter::update();
|
||||
LLMarketplaceInventoryImporter::update();
|
||||
LLMarketplaceInventoryNotifications::update();
|
||||
|
||||
// objects and camera should be in sync, do LOD calculations now
|
||||
|
||||
Reference in New Issue
Block a user