summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorybridge.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2014-04-16 16:56:01 -0700
committerMerov Linden <merov@lindenlab.com>2014-04-16 16:56:01 -0700
commita4f6fc8ee1a4231d2b81d28035b21b8f8b3fd8fd (patch)
treee7eddbb8207ddc673899fd3bc7ae86d654c86ea2 /indra/newview/llinventorybridge.cpp
parent8bc5a7919b23bec4c1f3caf9847b4eef6b5bd793 (diff)
DD-11 : Implement getListingURL() and parametrize it correctly. Change Show Listing to Edit Listing.
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
-rwxr-xr-xindra/newview/llinventorybridge.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 374d09ce98..128f0e1b91 100755
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -1546,6 +1546,11 @@ void LLItemBridge::performAction(LLInventoryModel* model, std::string action)
{
doActionOnCurSelectedLandmark(boost::bind(&LLItemBridge::doShowOnMap, this, _1));
}
+ else if ("marketplace_show_listing" == action)
+ {
+ std::string url = LLMarketplaceData::instance().getListingURL(mUUID);
+ LLUrlAction::openURL(url);
+ }
}
void LLItemBridge::doActionOnCurSelectedLandmark(LLLandmarkList::loaded_callback_t cb)
@@ -3191,13 +3196,7 @@ void LLFolderBridge::performAction(LLInventoryModel* model, std::string action)
}
else if ("marketplace_show_listing" == action)
{
- // *TODO : Need to show a browser window with the info for the listing
- // Get the listing id (i.e. go up the hierarchy to find the listing folder
- // Show the listing folder in a browser window
- // https://marketplace.secondlife.com/p/Nounours/4438852
- // https://marketplace.secondlife.com/p/Un-autre-nounours/4447997?preview=true
- // https://marketplace.secondlife.com/p/<listing_name>/<listing_id>?preview=true
- std::string url("https://marketplace.secondlife.com/p/Un-autre-nounours/4447997?preview=true");
+ std::string url = LLMarketplaceData::instance().getListingURL(mUUID);
LLUrlAction::openURL(url);
return;
}