summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterchangeitemthumbnail.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llfloaterchangeitemthumbnail.h')
-rw-r--r--indra/newview/llfloaterchangeitemthumbnail.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/indra/newview/llfloaterchangeitemthumbnail.h b/indra/newview/llfloaterchangeitemthumbnail.h
index a91e9b8ee9..16d60ab56a 100644
--- a/indra/newview/llfloaterchangeitemthumbnail.h
+++ b/indra/newview/llfloaterchangeitemthumbnail.h
@@ -100,10 +100,11 @@ private:
void showTexturePicker(const LLUUID &thumbnail_id);
void onTexturePickerCommit();
+ static void onUploadComplete(const LLUUID& asset_id, const LLUUID& task_id, const uuid_set_t& inventory_ids);
void setThumbnailId(const LLUUID &new_thumbnail_id);
- static void setThumbnailId(const LLUUID& new_thumbnail_id, const LLUUID& object_id);
- static void setThumbnailId(const LLUUID& new_thumbnail_id, const LLUUID& object_id, LLInventoryObject* obj);
+ static void setThumbnailId(const LLUUID& new_thumbnail_id, const LLUUID& task_id, const LLUUID& inv_obj_id);
+ static void setThumbnailId(const LLUUID& new_thumbnail_id, const LLUUID& inv_obj_id, LLInventoryObject* obj);
enum EToolTipState
{
@@ -121,7 +122,7 @@ private:
bool mObserverInitialized;
EToolTipState mTooltipState;
- LLUUID mItemId;
+ uuid_set_t mItemList;
LLUUID mTaskId;
LLUUID mExpectingAssetId;