Merge branch 'develop' of github.com:secondlife/viewer into roxie/webrtc-voice

1 files changed, 8 insertions, 9 deletions

diff --git a/indra/newview/lltextureview.h b/indra/newview/lltextureview.h
index 7e95f0f149..77ffe7d809 100644
--- a/indra/newview/lltextureview.h
+++ b/indra/newview/lltextureview.h
@@ -45,23 +45,22 @@ protected:
 public:
     ~LLTextureView();
 
-    /*virtual*/ void draw();
-    /*virtual*/ BOOL handleMouseDown(S32 x, S32 y, MASK mask);
-    /*virtual*/ BOOL handleMouseUp(S32 x, S32 y, MASK mask);
-    /*virtual*/ BOOL handleKey(KEY key, MASK mask, BOOL called_from_parent);
+    void draw() override;
+    bool handleMouseDown(S32 x, S32 y, MASK mask) override;
+    bool handleMouseUp(S32 x, S32 y, MASK mask) override;
+    bool handleKey(KEY key, MASK mask, bool called_from_parent) override;
 
     static void addDebugImage(LLViewerFetchedTexture* image) { sDebugImages.insert(image); }
     static void removeDebugImage(LLViewerFetchedTexture* image) { sDebugImages.insert(image); }
     static void clearDebugImages() { sDebugImages.clear(); }
 
 private:
-    BOOL addBar(LLViewerFetchedTexture *image, BOOL hilight = FALSE);
-    void removeAllBars();
+    bool addBar(LLViewerFetchedTexture *image, S32 hilight = 0);
 
 private:
-    BOOL mFreezeView;
-    BOOL mOrderFetch;
-    BOOL mPrintList;
+    bool mFreezeView;
+    bool mOrderFetch;
+    bool mPrintList;
 
     LLTextBox *mInfoTextp;