summaryrefslogtreecommitdiff
path: root/indra/newview/lloutfitgallery.h
diff options
context:
space:
mode:
authorpavelkproductengine <pavelkproductengine@lindenlab.com>2016-07-26 19:18:03 +0300
committerpavelkproductengine <pavelkproductengine@lindenlab.com>2016-07-26 19:18:03 +0300
commit7187ec75a7095ab7bf1d49896d2f4f72b7899243 (patch)
tree05e0a5b0a4e50036d5812c2ae06ceb27a8facf39 /indra/newview/lloutfitgallery.h
parent97d73a7c31da32f1555215efe6a21a3428153341 (diff)
MAINT-6476 VOB - User can add any size image to an Outfit Gallery outfit folders
Added restriction of image size that can be added to outfit via "Select Photo"
Diffstat (limited to 'indra/newview/lloutfitgallery.h')
-rw-r--r--indra/newview/lloutfitgallery.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/lloutfitgallery.h b/indra/newview/lloutfitgallery.h
index f5954d9cc2..6b13f264a4 100644
--- a/indra/newview/lloutfitgallery.h
+++ b/indra/newview/lloutfitgallery.h
@@ -111,6 +111,7 @@ public:
void refreshOutfit(const LLUUID& category_id);
void onTexturePickerCommit(LLTextureCtrl::ETexturePickOp op, LLUUID id);
+ void onTexturePickerUpdateImageStats(LLPointer<LLViewerTexture> texture);
void onBeforeOutfitSnapshotSave();
void onAfterOutfitSnapshotSave();
protected:
@@ -168,6 +169,7 @@ private:
bool mGalleryCreated;
int mRowCount;
int mItemsAddedCount;
+ LLPointer<LLViewerTexture> mTextureSelected;
/* Params */
int mRowPanelHeight;
int mVerticalGap;
@@ -266,7 +268,7 @@ public:
void setHidden(bool hidden) {mHidden = hidden;}
private:
- LLPointer<LLViewerTexture> mTexturep;
+ LLPointer<LLViewerFetchedTexture> mTexturep;
LLUUID mImageAssetId;
LLTextBox* mOutfitNameText;
LLTextBox* mOutfitWornText;