livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EXT-7639 FIXED (Make shop button open different URLs depending on what is selected in outfit editor) - 'Add More' panel multiple selection behavior 

Implemented the following behavior: \"if multiple selection is made in the Add More panel then default marketplace home URL can be used\".

Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/769/

--HG--
branch : product-engine
meow-7.2.2
Andrew Polunin 2010-07-16 18:19:31 +03:00
parent f3f5687416
commit 0fa0ffb574
2 changed files with 38 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
indra/newview/llpaneloutfitedit.cpp
View File

@ -629,24 +629,35 @@ void LLPanelOutfitEdit::onShopButtonClicked()
if (isAgentAvatarValid())
{
// try to get wearable type from 'Add More' panel first (EXT-7639)
LLWearableType::EType type = getAddMorePanelSelectionType();
selection_info_t selection_info = getAddMorePanelSelectionType();
if (type == LLWearableType::WT_NONE)
LLWearableType::EType type = selection_info.first;
if (selection_info.second > 1)
{
type = getCOFWearablesSelectionType();
// the second argument is not important in this case: generic market place will be opened
url = url_resolver.resolveURL(LLWearableType::WT_NONE, SEX_FEMALE);
}
ESex sex = gAgentAvatarp->getSex();
// WT_INVALID comes for attachments
if (type != LLWearableType::WT_INVALID && type != LLWearableType::WT_NONE)
else
{
url = url_resolver.resolveURL(type, sex);
}
if (type == LLWearableType::WT_NONE)
{
type = getCOFWearablesSelectionType();
}
if (url.empty())
{
url = url_resolver.resolveURL(mCOFWearables->getExpandedAccordionAssetType(), sex);
ESex sex = gAgentAvatarp->getSex();
// WT_INVALID comes for attachments
if (type != LLWearableType::WT_INVALID && type != LLWearableType::WT_NONE)
{
url = url_resolver.resolveURL(type, sex);
}
if (url.empty())
{
url = url_resolver.resolveURL(
mCOFWearables->getExpandedAccordionAssetType(), sex);
}
}
}
else
@ -685,9 +696,9 @@ LLWearableType::EType LLPanelOutfitEdit::getCOFWearablesSelectionType() const
return type;
}
LLWearableType::EType LLPanelOutfitEdit::getAddMorePanelSelectionType() const
LLPanelOutfitEdit::selection_info_t LLPanelOutfitEdit::getAddMorePanelSelectionType() const
{
LLWearableType::EType type = LLWearableType::WT_NONE;
selection_info_t result = std::make_pair(LLWearableType::WT_NONE, 0);
if (mAddWearablesPanel != NULL && mAddWearablesPanel->getVisible())
{
@ -695,9 +706,11 @@ LLWearableType::EType LLPanelOutfitEdit::getAddMorePanelSelectionType() const
{
std::set<LLUUID> selected_uuids = mInventoryItemsPanel->getRootFolder()->getSelectionList();
if (selected_uuids.size() == 1)
result.second = selected_uuids.size();
if (result.second == 1)
{
type = getWearableTypeByItemUUID(*(selected_uuids.begin()));
result.first = getWearableTypeByItemUUID(*(selected_uuids.begin()));
}
}
else if (mWearableItemsList != NULL && mWearableItemsList->getVisible())
@ -705,14 +718,16 @@ LLWearableType::EType LLPanelOutfitEdit::getAddMorePanelSelectionType() const
std::vector<LLUUID> selected_uuids;
mWearableItemsList->getSelectedUUIDs(selected_uuids);
if (selected_uuids.size() == 1)
result.second = selected_uuids.size();
if (result.second == 1)
{
type = getWearableTypeByItemUUID(selected_uuids.front());
result.first = getWearableTypeByItemUUID(selected_uuids.front());
}
}
}
return type;
return result;
}
LLWearableType::EType LLPanelOutfitEdit::getWearableTypeByItemUUID(const LLUUID& item_uuid) const

4
indra/newview/llpaneloutfitedit.h
View File

@ -198,8 +198,10 @@ private:
void getCurrentItemUUID(LLUUID& selected_id);
void onCOFChanged();
typedef std::pair<LLWearableType::EType, size_t> selection_info_t;
LLWearableType::EType getCOFWearablesSelectionType() const;
LLWearableType::EType getAddMorePanelSelectionType() const;
selection_info_t getAddMorePanelSelectionType() const;
LLWearableType::EType getWearableTypeByItemUUID(const LLUUID& item_uuid) const;
LLTextBox* mCurrentOutfitName;