Skip to content
Snippets Groups Projects
Commit 5cf4d63a authored by Leyla Farazha's avatar Leyla Farazha
Browse files

attempting to do the outbox import

parent adf39dd1
No related branches found
No related tags found
No related merge requests found
...@@ -38,6 +38,9 @@ ...@@ -38,6 +38,9 @@
#include "llsidepanelinventory.h" #include "llsidepanelinventory.h"
#include "llsidetray.h" #include "llsidetray.h"
#include "lltimer.h" #include "lltimer.h"
#include "llviewernetwork.h"
#include "llagent.h"
#include "llviewermedia.h"
#include "llfolderview.h" #include "llfolderview.h"
static LLRegisterPanelClassWrapper<LLPanelMarketplaceOutbox> t_panel_marketplace_outbox("panel_marketplace_outbox"); static LLRegisterPanelClassWrapper<LLPanelMarketplaceOutbox> t_panel_marketplace_outbox("panel_marketplace_outbox");
...@@ -190,10 +193,46 @@ void timeDelay(LLCoros::self& self, LLPanelMarketplaceOutbox* outboxPanel) ...@@ -190,10 +193,46 @@ void timeDelay(LLCoros::self& self, LLPanelMarketplaceOutbox* outboxPanel)
gTimeDelayDebugFunc = ""; gTimeDelayDebugFunc = "";
} }
class LLInventorySyncResponder : public LLHTTPClient::Responder
{
public:
LLInventorySyncResponder()
: LLCurl::Responder()
{
}
void completed(U32 status, const std::string& reason, const LLSD& content)
{
if (isGoodStatus(status))
{
// Complete success
llinfos << "sync complete" << llendl;
}
else
{
llwarns << "sync failed" << llendl;
}
}
};
void LLPanelMarketplaceOutbox::onSyncButtonClicked() void LLPanelMarketplaceOutbox::onSyncButtonClicked()
{ {
// TODO: Actually trigger sync to marketplace std::string url = "http://pdp24.lindenlab.com/3000"; /*"https://marketplace.secondlife.com/";
if (!LLGridManager::getInstance()->isInProductionGrid())
{
std::string gridLabel = LLGridManager::getInstance()->getGridLabel();
url = llformat("https://marketplace.%s.lindenlab.com/", utf8str_tolower(gridLabel).c_str());
}
*/
url += "api/1/users/";
url += gAgent.getID().getString();
url += "/inventory_import";
LLHTTPClient::get(url, new LLInventorySyncResponder(), LLViewerMedia::getHeaders());
mSyncInProgress = true; mSyncInProgress = true;
updateSyncButtonStatus(); updateSyncButtonStatus();
......
...@@ -1394,6 +1394,17 @@ class LLInventoryUserStatusResponder : public LLHTTPClient::Responder ...@@ -1394,6 +1394,17 @@ class LLInventoryUserStatusResponder : public LLHTTPClient::Responder
} }
}; };
LLSD LLViewerMedia::getHeaders()
{
LLSD headers = LLSD::emptyMap();
headers["Accept"] = "*/*";
headers["Cookie"] = sOpenIDCookie;
headers["User-Agent"] = getCurrentUserAgent();
return headers;
}
///////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////
// static // static
void LLViewerMedia::setOpenIDCookie() void LLViewerMedia::setOpenIDCookie()
......
...@@ -162,6 +162,8 @@ class LLViewerMedia ...@@ -162,6 +162,8 @@ class LLViewerMedia
static LLPluginClassMedia* getSpareBrowserMediaSource(); static LLPluginClassMedia* getSpareBrowserMediaSource();
static void setOnlyAudibleMediaTextureID(const LLUUID& texture_id); static void setOnlyAudibleMediaTextureID(const LLUUID& texture_id);
static LLSD getHeaders();
private: private:
static void setOpenIDCookie(); static void setOpenIDCookie();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment