From 4ec13dcf8c331bc39a00aa6fec8397b6714172ba Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Mon, 21 Apr 2014 18:42:56 -0700 Subject: DD-21 : WIP : Call DirectDelivery cap, nothing done but print out the url in the log --- indra/newview/llmarketplacefunctions.cpp | 13 +++++++++++++ indra/newview/llviewerregion.cpp | 1 + 2 files changed, 14 insertions(+) (limited to 'indra/newview') diff --git a/indra/newview/llmarketplacefunctions.cpp b/indra/newview/llmarketplacefunctions.cpp index 6ff6ba6714..3fa2c58cba 100755 --- a/indra/newview/llmarketplacefunctions.cpp +++ b/indra/newview/llmarketplacefunctions.cpp @@ -37,6 +37,7 @@ #include "llviewercontrol.h" #include "llviewermedia.h" #include "llviewernetwork.h" +#include "llviewerregion.h" // @@ -426,6 +427,18 @@ void LLMarketplaceInventoryImporter::initialize() return; } + // Test DirectDelivery cap + LLViewerRegion* region = gAgent.getRegion(); + if (region) + { + std::string url = region->getCapability("DirectDelivery"); + llinfos << "Merov : Test DirectDelivery cap : url = " << url << llendl; + } + else + { + llinfos << "Merov : Test DirectDelivery cap : no region accessible" << llendl; + } + if (!LLMarketplaceImport::hasSessionCookie()) { mMarketPlaceStatus = MarketplaceStatusCodes::MARKET_PLACE_INITIALIZING; diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp index a271690349..7a57badf79 100755 --- a/indra/newview/llviewerregion.cpp +++ b/indra/newview/llviewerregion.cpp @@ -1593,6 +1593,7 @@ void LLViewerRegionImpl::buildCapabilityNames(LLSD& capabilityNames) capabilityNames.append("CopyInventoryFromNotecard"); capabilityNames.append("CreateInventoryCategory"); capabilityNames.append("DispatchRegionInfo"); + capabilityNames.append("DirectDelivery"); capabilityNames.append("EnvironmentSettings"); capabilityNames.append("EstateChangeInfo"); capabilityNames.append("EventQueueGet"); -- cgit v1.2.3