summaryrefslogtreecommitdiff
path: root/indra/newview/llpaneloutfitedit.h
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-07-19 09:10:41 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-07-19 09:10:41 +0100
commit3bb5d368a21e2645222f0f5fa57b0a0abb236084 (patch)
tree9252aa83846139a3932dadb2260a4acdfeff0086 /indra/newview/llpaneloutfitedit.h
parent94cae52bb791b8ceef4d55eed8c8726e63572b61 (diff)
parent0fa0ffb5748bd9b8d61954649eafe3e28517548c (diff)
merge from PE's viewer-release
Diffstat (limited to 'indra/newview/llpaneloutfitedit.h')
-rw-r--r--indra/newview/llpaneloutfitedit.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llpaneloutfitedit.h b/indra/newview/llpaneloutfitedit.h
index 770e2a229b..fe10215f27 100644
--- a/indra/newview/llpaneloutfitedit.h
+++ b/indra/newview/llpaneloutfitedit.h
@@ -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;