diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-07-20 21:54:19 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-07-20 21:54:19 +0800 |
| commit | 4cf12a6d223a238ff30f8b334ca91836c7369f88 (patch) | |
| tree | a2bf8fa27e5fff8a1b8a75cdb5d835f4e959f145 /indra/newview/llinventorybridge.h | |
| parent | 13f24f2419edeefbda8bedab01fad21cb97b7445 (diff) | |
| parent | 569d97707459d5f87cb04a0811c0b7eb1b5c2251 (diff) | |
Merge branch 'main' into webrtc-voice
Diffstat (limited to 'indra/newview/llinventorybridge.h')
| -rw-r--r-- | indra/newview/llinventorybridge.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h index b0139e225e..70a457f98c 100644 --- a/indra/newview/llinventorybridge.h +++ b/indra/newview/llinventorybridge.h @@ -378,7 +378,10 @@ public: static void staticFolderOptionsMenu(); protected: - void outfitFolderCreatedCallback(LLUUID cat_source_id, LLUUID cat_dest_id, LLPointer<LLInventoryCallback> cb); + static void outfitFolderCreatedCallback(LLUUID cat_source_id, + LLUUID cat_dest_id, + LLPointer<LLInventoryCallback> cb, + LLHandle<LLInventoryPanel> inventory_panel); void callback_pasteFromClipboard(const LLSD& notification, const LLSD& response); void perform_pasteFromClipboard(); void gatherMessage(std::string& message, S32 depth, LLError::ELevel log_level); |