summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorybridge.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2014-05-07 16:44:14 -0700
committerMerov Linden <merov@lindenlab.com>2014-05-07 16:44:14 -0700
commit00c1094c7d230fdf0670a7e8c2218bb6b1a677ca (patch)
tree14695b0019bf4cc2aee9fc9019ac6735554be8a0 /indra/newview/llinventorybridge.cpp
parentbd0d62c339d197ec2fa50cc642a864071677dc3a (diff)
DD-22 : WIP : Completed the associate_listing route, take edit_url into account and rewrite getListingURL()
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
-rwxr-xr-xindra/newview/llinventorybridge.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index f68d69b1c3..11ae3b6189 100755
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -3226,7 +3226,10 @@ void LLFolderBridge::performAction(LLInventoryModel* model, std::string action)
else if ("marketplace_edit_listing" == action)
{
std::string url = LLMarketplaceData::instance().getListingURL(mUUID);
- LLUrlAction::openURL(url);
+ if (!url.empty())
+ {
+ LLUrlAction::openURL(url);
+ }
return;
}
#ifndef LL_RELEASE_FOR_DOWNLOAD