diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-06-10 14:04:53 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-06-10 14:04:53 -0700 |
| commit | ae2f24d0c10a9a91090aa040f8367e8691fcbbd1 (patch) | |
| tree | f71d8be0637e695cdd58491ea02cb1305d8843ae /indra/newview/llinventorybridge.cpp | |
| parent | d37ef40e98059e0ceb40385e3c40e891e6eec4ec (diff) | |
DD : Clean up marketplace listings folder creation so we create it in only one place
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rwxr-xr-x | indra/newview/llinventorybridge.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index cd5da96e24..84cf62f910 100755 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -319,11 +319,9 @@ BOOL LLInvFVBridge::copyToClipboard() const return FALSE; } -// *TODO: make sure this does the right thing void LLInvFVBridge::showProperties() { - LLUUID marketplacelistings_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS, true); - if (gInventory.isObjectDescendentOf(mUUID, marketplacelistings_id)) + if (isMarketplaceListingsFolder()) { LLFloaterReg::showInstance("item_properties", LLSD().with("id",mUUID)); } @@ -331,11 +329,6 @@ void LLInvFVBridge::showProperties() { show_item_profile(mUUID); } - - // Disable old properties floater; this is replaced by the sidepanel. - /* - LLFloaterReg::showInstance("properties", mUUID); - */ } void LLInvFVBridge::removeBatch(std::vector<LLFolderViewModelItem*>& batch) |