summaryrefslogtreecommitdiff
path: root/indra/newview/llpreviewtexture.h
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2010-02-05 16:47:38 -0800
committerLeyla Farazha <leyla@lindenlab.com>2010-02-05 16:47:38 -0800
commit91b2ff00ae874f938919373c0db3de0721c7bf25 (patch)
treee0c4c8e11cd4a158c1f7d53fea7434eee3781d97 /indra/newview/llpreviewtexture.h
parent617a7a0ebdd47aeea578456f4ed0d91ab8582a0b (diff)
parent68ea862c96a96be631505e88ae870d6aab066eb9 (diff)
Merge
Diffstat (limited to 'indra/newview/llpreviewtexture.h')
-rw-r--r--indra/newview/llpreviewtexture.h3
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;