summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterimagepreview.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llfloaterimagepreview.h')
-rw-r--r--indra/newview/llfloaterimagepreview.h26
1 files changed, 14 insertions, 12 deletions
diff --git a/indra/newview/llfloaterimagepreview.h b/indra/newview/llfloaterimagepreview.h
index 6facea0ad8..ed395722de 100644
--- a/indra/newview/llfloaterimagepreview.h
+++ b/indra/newview/llfloaterimagepreview.h
@@ -48,17 +48,17 @@ protected:
public:
LLImagePreviewSculpted(S32 width, S32 height);
- /*virtual*/ S8 getType() const ;
+ S8 getType() const override;
void setPreviewTarget(LLImageRaw *imagep, F32 distance);
void setTexture(U32 name) { mTextureName = name; }
- bool render();
+ bool render() override;
void refresh();
void rotate(F32 yaw_radians, F32 pitch_radians);
void zoom(F32 zoom_amt);
void pan(F32 right, F32 up);
- virtual bool needsRender() { return mNeedsUpdate; }
+ virtual bool needsRender() override { return mNeedsUpdate; }
protected:
bool mNeedsUpdate;
@@ -81,18 +81,18 @@ protected:
public:
LLImagePreviewAvatar(S32 width, S32 height);
- /*virtual*/ S8 getType() const ;
+ S8 getType() const override;
void setPreviewTarget(const std::string& joint_name, const std::string& mesh_name, LLImageRaw* imagep, F32 distance, bool male);
void setTexture(U32 name) { mTextureName = name; }
void clearPreviewTexture(const std::string& mesh_name);
- bool render();
+ bool render() override;
void refresh();
void rotate(F32 yaw_radians, F32 pitch_radians);
void zoom(F32 zoom_amt);
void pan(F32 right, F32 up);
- virtual bool needsRender() { return mNeedsUpdate; }
+ virtual bool needsRender() override { return mNeedsUpdate; }
protected:
bool mNeedsUpdate;
@@ -113,12 +113,14 @@ public:
LLFloaterImagePreview(const std::string& filename);
virtual ~LLFloaterImagePreview();
- virtual bool postBuild();
+ bool postBuild() override;
- bool handleMouseDown(S32 x, S32 y, MASK mask);
- bool handleMouseUp(S32 x, S32 y, MASK mask);
- bool handleHover(S32 x, S32 y, MASK mask);
- bool handleScrollWheel(S32 x, S32 y, S32 clicks);
+ S32 getExpectedUploadCost() const override;
+
+ bool handleMouseDown(S32 x, S32 y, MASK mask) override;
+ bool handleMouseUp(S32 x, S32 y, MASK mask) override;
+ bool handleHover(S32 x, S32 y, MASK mask) override;
+ bool handleScrollWheel(S32 x, S32 y, S32 clicks) override;
static void onMouseCaptureLostImagePreview(LLMouseHandler*);
@@ -126,7 +128,7 @@ public:
protected:
static void onPreviewTypeCommit(LLUICtrl*,void*);
- void draw();
+ void draw() override;
bool loadImage(const std::string& filename);
LLPointer<LLImageRaw> mRawImagep;