diff options
| author | Mnikolenko Productengine <mnikolenko@productengine.com> | 2017-07-11 14:54:29 +0300 |
|---|---|---|
| committer | Mnikolenko Productengine <mnikolenko@productengine.com> | 2017-07-11 14:54:29 +0300 |
| commit | 5478f2a223b5b679fe4515aa5a88f9ae1ed36985 (patch) | |
| tree | 1b42c557249b90982eee5da45066d13abac5b252 /indra/newview/llfloaterlinkreplace.h | |
| parent | 2c77a197be1b1c5c19008f9cd5ea7508a61d1bfe (diff) | |
MAINT-7581 [contribution] Closing the 'Replace links' floater crashes the viewer if a replace is in progress
Diffstat (limited to 'indra/newview/llfloaterlinkreplace.h')
| -rw-r--r-- | indra/newview/llfloaterlinkreplace.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/indra/newview/llfloaterlinkreplace.h b/indra/newview/llfloaterlinkreplace.h index 377dd1d450..dd5c301206 100644 --- a/indra/newview/llfloaterlinkreplace.h +++ b/indra/newview/llfloaterlinkreplace.h @@ -98,12 +98,9 @@ private: void updateFoundLinks(); void processBatch(LLInventoryModel::item_array_t items); - void linkCreatedCallback(const LLUUID& old_item_id, - const LLUUID& target_item_id, - bool needs_wearable_ordering_update, - bool needs_description_update, - const LLUUID& outfit_folder_id); - void itemRemovedCallback(const LLUUID& outfit_folder_id); + static void linkCreatedCallback(LLHandle<LLFloaterLinkReplace> floater_handle, const LLUUID& old_item_id, const LLUUID& target_item_id, + bool needs_wearable_ordering_update, bool needs_description_update, const LLUUID& outfit_folder_id); + static void itemRemovedCallback(LLHandle<LLFloaterLinkReplace> floater_handle, const LLUUID& outfit_folder_id); void onSourceItemDrop(const LLUUID& source_item_id); void onTargetItemDrop(const LLUUID& target_item_id); @@ -120,8 +117,6 @@ private: U32 mBatchSize; LLInventoryModel::item_array_t mRemainingInventoryItems; - - LLFloaterLinkReplace* mInstance; }; #endif // LL_FLOATERLINKREPLACE_H |