diff options
author | Christian Goetze (CG) <cg@lindenlab.com> | 2010-07-22 13:29:05 -0700 |
---|---|---|
committer | Christian Goetze (CG) <cg@lindenlab.com> | 2010-07-22 13:29:05 -0700 |
commit | fe8a5a007ab82f3d6a763c5cb133e1299d238632 (patch) | |
tree | 7a0787f0cb5a70890b878e999521ff4522fd75b4 /indra/newview/llpreviewtexture.h | |
parent | 4339600d43601f07d01c676cce5da17c2758c4cb (diff) | |
parent | 9838884d908ad0c910251c64c7cb3c761ac11f70 (diff) |
merged from "viewer-hotfix"
Diffstat (limited to 'indra/newview/llpreviewtexture.h')
-rw-r--r-- | indra/newview/llpreviewtexture.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/llpreviewtexture.h b/indra/newview/llpreviewtexture.h index cbdb057781..0f29a741c1 100644 --- a/indra/newview/llpreviewtexture.h +++ b/indra/newview/llpreviewtexture.h @@ -82,10 +82,9 @@ private: void updateDimensions(); LLUUID mImageID; LLPointer<LLViewerFetchedTexture> mImage; - S32 mImageOldBoostLevel; + BOOL mLoadingFullImage; std::string mSaveFileName; LLFrameTimer mSavedFileTimer; - BOOL mLoadingFullImage; BOOL mShowKeepDiscard; BOOL mCopyToInv; @@ -95,10 +94,11 @@ 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; + F32 mAspectRatio; + BOOL mUpdateDimensions; LLLoadedCallbackEntry::source_callback_list_t mCallbackTextureList ; }; |