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.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/indra/newview/llfloaterchangeitemthumbnail.h b/indra/newview/llfloaterchangeitemthumbnail.h
index a219adb6f5..340d5cf05e 100644
--- a/indra/newview/llfloaterchangeitemthumbnail.h
+++ b/indra/newview/llfloaterchangeitemthumbnail.h
@@ -55,12 +55,10 @@ public:
private:
+ LLViewerInventoryItem* getItem();
void refreshFromInventory();
void refreshFromItem(LLViewerInventoryItem* item);
- void startObjectInventoryObserver();
- void stopObjectInventoryObserver();
-
static void onUploadLocal(void*);
static void onUploadSnapshot(void*);
static void onUseTexture(void*);
@@ -68,6 +66,9 @@ private:
static void onPasteFromClipboard(void*);
static void onRemove(void*);
+ void showTexturePicker(const LLUUID &thumbnail_id);
+ void onTexturePickerCommit(LLUUID id);
+
enum EToolTipState
{
TOOLTIP_NONE,
@@ -94,5 +95,7 @@ private:
LLButton *mCopyToClipboardBtn;
LLButton *mPasteFromClipboardBtn;
LLButton *mRemoveImageBtn;
+
+ LLHandle<LLFloater> mPickerHandle;
};
#endif // LL_LLFLOATERCHANGEITEMTHUMBNAIL_H