7a35a43bd4
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!
95 lines
2.6 KiB
C++
95 lines
2.6 KiB
C++
/**
|
|
* @file llmarketplacefunctions.h
|
|
* @brief Miscellaneous marketplace-related functions and classes
|
|
* class definition
|
|
*
|
|
* $LicenseInfo:firstyear=2001&license=viewerlgpl$
|
|
* Second Life Viewer Source Code
|
|
* Copyright (C) 2011, Linden Research, Inc.
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation;
|
|
* version 2.1 of the License only.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*
|
|
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
|
|
* $/LicenseInfo$
|
|
*/
|
|
|
|
#ifndef LL_LLMARKETPLACEFUNCTIONS_H
|
|
#define LL_LLMARKETPLACEFUNCTIONS_H
|
|
|
|
|
|
#include <llsd.h>
|
|
#include <boost/function.hpp>
|
|
#include <boost/signals2.hpp>
|
|
|
|
#include "llsingleton.h"
|
|
#include "llstring.h"
|
|
|
|
|
|
LLSD getMarketplaceStringSubstitutions();
|
|
|
|
|
|
namespace MarketplaceErrorCodes
|
|
{
|
|
enum eCode
|
|
{
|
|
IMPORT_DONE = 200,
|
|
IMPORT_PROCESSING = 202,
|
|
IMPORT_REDIRECT = 302,
|
|
IMPORT_AUTHENTICATION_ERROR = 401,
|
|
IMPORT_DONE_WITH_ERRORS = 409,
|
|
IMPORT_JOB_FAILED = 410,
|
|
IMPORT_JOB_TIMEOUT = 499,
|
|
};
|
|
}
|
|
|
|
|
|
class LLMarketplaceInventoryImporter
|
|
: public LLSingleton<LLMarketplaceInventoryImporter>
|
|
{
|
|
public:
|
|
static void update();
|
|
|
|
LLMarketplaceInventoryImporter();
|
|
|
|
typedef boost::signals2::signal<void (bool)> status_changed_signal_t;
|
|
typedef boost::signals2::signal<void (U32, const LLSD&)> status_report_signal_t;
|
|
|
|
boost::signals2::connection setInitializationErrorCallback(const status_report_signal_t::slot_type& cb);
|
|
boost::signals2::connection setStatusChangedCallback(const status_changed_signal_t::slot_type& cb);
|
|
boost::signals2::connection setStatusReportCallback(const status_report_signal_t::slot_type& cb);
|
|
|
|
void initialize();
|
|
bool triggerImport();
|
|
bool isImportInProgress() const { return mImportInProgress; }
|
|
|
|
protected:
|
|
void reinitializeAndTriggerImport();
|
|
void updateImport();
|
|
|
|
private:
|
|
bool mAutoTriggerImport;
|
|
bool mImportInProgress;
|
|
bool mInitialized;
|
|
|
|
status_report_signal_t * mErrorInitSignal;
|
|
status_changed_signal_t * mStatusChangedSignal;
|
|
status_report_signal_t * mStatusReportSignal;
|
|
};
|
|
|
|
|
|
|
|
#endif // LL_LLMARKETPLACEFUNCTIONS_H
|
|
|