summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorybridge.h
diff options
context:
space:
mode:
authorandreykproductengine <andreykproductengine@lindenlab.com>2019-10-15 21:28:37 +0300
committerandreykproductengine <andreykproductengine@lindenlab.com>2019-10-15 21:28:37 +0300
commitaf5c556270eb186f62aaece398ed97a870be220a (patch)
treec94fe2a938f9421c721343d2209f4941b280365d /indra/newview/llinventorybridge.h
parentbd42fd13b038dea5bddf06ed8da7b51d08b38bae (diff)
parent33821bd599d1d9171cc93c38a2bc6c4ab6772c9a (diff)
Merge from viewer-release
Diffstat (limited to 'indra/newview/llinventorybridge.h')
-rw-r--r--indra/newview/llinventorybridge.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h
index f4df566fa6..0823cf8b52 100644
--- a/indra/newview/llinventorybridge.h
+++ b/indra/newview/llinventorybridge.h
@@ -359,6 +359,7 @@ protected:
void dropToFavorites(LLInventoryItem* inv_item);
void dropToOutfit(LLInventoryItem* inv_item, BOOL move_is_into_current_outfit);
+ void dropToMyOutfits(LLInventoryCategory* inv_cat);
//--------------------------------------------------------------------
// Messy hacks for handling folder options
@@ -368,6 +369,7 @@ public:
static void staticFolderOptionsMenu();
protected:
+ void outfitFolderCreatedCallback(LLUUID cat_source_id, LLUUID cat_dest_id);
void callback_pasteFromClipboard(const LLSD& notification, const LLSD& response);
void perform_pasteFromClipboard();
void gatherMessage(std::string& message, S32 depth, LLError::ELevel log_level);