summaryrefslogtreecommitdiff
path: root/indra/newview/llpreviewtexture.h
diff options
context:
space:
mode:
authorDessie Linden <dessie@lindenlab.com>2010-07-14 06:39:14 -0700
committerDessie Linden <dessie@lindenlab.com>2010-07-14 06:39:14 -0700
commitb46fff1ba1450d14424e676f31c0cacd921bedb0 (patch)
tree7e38cb35375b235deaf1f0ea5374e6c1bcd10f7f /indra/newview/llpreviewtexture.h
parentc201038aba861b1166d367fcf5986e33644ec018 (diff)
parent4339600d43601f07d01c676cce5da17c2758c4cb (diff)
Merged from viewer-release
Diffstat (limited to 'indra/newview/llpreviewtexture.h')
-rw-r--r--indra/newview/llpreviewtexture.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llpreviewtexture.h b/indra/newview/llpreviewtexture.h
index 0f29a741c1..cbdb057781 100644
--- a/indra/newview/llpreviewtexture.h
+++ b/indra/newview/llpreviewtexture.h
@@ -82,9 +82,10 @@ private:
void updateDimensions();
LLUUID mImageID;
LLPointer<LLViewerFetchedTexture> mImage;
- BOOL mLoadingFullImage;
+ S32 mImageOldBoostLevel;
std::string mSaveFileName;
LLFrameTimer mSavedFileTimer;
+ BOOL mLoadingFullImage;
BOOL mShowKeepDiscard;
BOOL mCopyToInv;
@@ -94,11 +95,10 @@ private:
// This is stored off in a member variable, because the save-as
// button and drag and drop functionality need to know.
BOOL mIsCopyable;
-
+ BOOL mUpdateDimensions;
S32 mLastHeight;
S32 mLastWidth;
- F32 mAspectRatio;
- BOOL mUpdateDimensions;
+ F32 mAspectRatio;
LLLoadedCallbackEntry::source_callback_list_t mCallbackTextureList ;
};