Merge branch 'main' into marchcat/c-merge

# Conflicts:
#	indra/newview/llviewermenufile.cpp

1 files changed, 14 insertions, 12 deletions

diff --git a/indra/newview/llfloaterimagepreview.h b/indra/newview/llfloaterimagepreview.h
index 47228d7676..6f0b20d14c 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 LLSD& args);
     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;