diff options
| author | Rider Linden <rider@lindenlab.com> | 2017-10-17 14:40:59 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2017-10-17 14:40:59 -0700 |
| commit | cf74a9438aae7ab1b10c7ffa77c6509e588869a0 (patch) | |
| tree | 79c2714ba2bb2e0d526b5644f5b832c911fe6900 /indra/newview/lloutfitgallery.h | |
| parent | 24ed3844afe2d54a03975c1704c595cf02e5643f (diff) | |
| parent | 5754493cdcfeac76d0576abc19bdf5a03717780d (diff) | |
Merge
Diffstat (limited to 'indra/newview/lloutfitgallery.h')
| -rw-r--r-- | indra/newview/lloutfitgallery.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/lloutfitgallery.h b/indra/newview/lloutfitgallery.h index 2566247072..b1ca850508 100644 --- a/indra/newview/lloutfitgallery.h +++ b/indra/newview/lloutfitgallery.h @@ -259,7 +259,7 @@ public: /*virtual*/ BOOL handleDoubleClick(S32 x, S32 y, MASK mask); void setDefaultImage(); - void setImageAssetId(LLUUID asset_id); + bool setImageAssetId(LLUUID asset_id); LLUUID getImageAssetId(); void setOutfitName(std::string name); void setOutfitWorn(bool value); @@ -282,6 +282,7 @@ private: bool mSelected; bool mWorn; bool mDefaultImage; + bool mImageUpdatePending; bool mHidden; std::string mOutfitName; }; |