diff options
| author | Merov Linden <merov@lindenlab.com> | 2014-04-21 15:26:14 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2014-04-21 15:26:14 -0700 |
| commit | cda6ac9e9b0dc9c75746440d98a98d3556ec9b4e (patch) | |
| tree | d31844606df07076fd32e01087d87f80acfccb31 /indra/newview/llinventorybridge.cpp | |
| parent | 250f05861eeec06b864e57c1fda6a996b6a94029 (diff) | |
DD-71 : Implement a new item properties floater, calls the same code as the sidepanel in the inventory but with the back button hidden
Diffstat (limited to 'indra/newview/llinventorybridge.cpp')
| -rwxr-xr-x | indra/newview/llinventorybridge.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index 3f2a5501bd..a9d5768854 100755 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -290,7 +290,15 @@ BOOL LLInvFVBridge::copyToClipboard() const // *TODO: make sure this does the right thing void LLInvFVBridge::showProperties() { - show_item_profile(mUUID); + LLUUID marketplacelistings_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MARKETPLACE_LISTINGS, true); + if (gInventory.isObjectDescendentOf(mUUID, marketplacelistings_id)) + { + LLFloaterReg::showInstance("item_properties", LLSD().with("id",mUUID)); + } + else + { + show_item_profile(mUUID); + } // Disable old properties floater; this is replaced by the sidepanel. /* |