diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2025-05-18 21:21:44 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-05-18 21:21:44 +0300 |
| commit | fdeef47611e7496ff5d5fb8f37e3b1f5240a8b14 (patch) | |
| tree | aab4b1664b82e8f49395fe3e3a75619724c9fd1c /indra/newview/llinventorybridge.h | |
| parent | 3569cc1993dc03637b29fcd77fe5b01b6ea372fb (diff) | |
| parent | a9c75d8136f9df6885e525ea8f2b383fe4a22593 (diff) | |
Merge branch 'geenz/gltf-mesh-import' into marchcat/gltf-mesh-texture-import
Diffstat (limited to 'indra/newview/llinventorybridge.h')
| -rw-r--r-- | indra/newview/llinventorybridge.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llinventorybridge.h b/indra/newview/llinventorybridge.h index a101c7368a..b7bdef9b21 100644 --- a/indra/newview/llinventorybridge.h +++ b/indra/newview/llinventorybridge.h @@ -369,7 +369,7 @@ protected: void dropToFavorites(LLInventoryItem* inv_item, LLPointer<LLInventoryCallback> cb = NULL); void dropToOutfit(LLInventoryItem* inv_item, bool move_is_into_current_outfit, LLPointer<LLInventoryCallback> cb = NULL); void dropToMyOutfits(LLInventoryCategory* inv_cat, LLPointer<LLInventoryCallback> cb = NULL); - void dropToMyOutfitsSubfolder(LLInventoryCategory* inv_cat, const LLUUID& dest, LLFolderType::EType preferred_type, LLPointer<LLInventoryCallback> cb = NULL); + void dropToMyOutfitsSubfolder(LLInventoryCategory* inv_cat, const LLUUID& dest, LLPointer<LLInventoryCallback> cb = NULL); //-------------------------------------------------------------------- // Messy hacks for handling folder options |