diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-02-04 10:22:28 -0500 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-02-04 10:22:28 -0500 |
commit | 76cf7ebf7037c2e579861c64c38fc24bde165669 (patch) | |
tree | 72152ff4ae4cb5f6422cd8c4c9830b4f76c3aa21 /indra/newview/llpreviewtexture.h | |
parent | d2d192060993d938a2fd131f8872a60b678e4a04 (diff) | |
parent | 9a15ee8a91a12020b22625873c280837739f946c (diff) |
merge
Diffstat (limited to 'indra/newview/llpreviewtexture.h')
-rw-r--r-- | indra/newview/llpreviewtexture.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llpreviewtexture.h b/indra/newview/llpreviewtexture.h index 980aecee6d..7cd2adad56 100644 --- a/indra/newview/llpreviewtexture.h +++ b/indra/newview/llpreviewtexture.h @@ -69,6 +69,8 @@ public: void openToSave(); static void onSaveAsBtn(void* data); + + /*virtual*/ void setObjectID(const LLUUID& object_id); protected: void init(); /* virtual */ BOOL postBuild(); @@ -76,6 +78,7 @@ protected: static void onAspectRatioCommit(LLUICtrl*,void* userdata); private: + void updateImageID(); // set what image is being uploaded. void updateDimensions(); LLUUID mImageID; LLPointer<LLViewerFetchedTexture> mImage; |