From 50dc3e705bb2cc7552a2c23683cf6b9ed94711a5 Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Sat, 25 May 2013 23:16:00 +1000 Subject: White space cleanups. --- linden/indra/newview/lltoolcomp.h | 24 ++++++++++++------------ linden/indra/newview/qtoolalign.cpp | 10 ++-------- 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/linden/indra/newview/lltoolcomp.h b/linden/indra/newview/lltoolcomp.h index 81ed0ba..b7ec940 100644 --- a/linden/indra/newview/lltoolcomp.h +++ b/linden/indra/newview/lltoolcomp.h @@ -113,8 +113,8 @@ public: virtual ~LLToolCompInspect(); // Overridden from LLToolComposite - virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask); - virtual BOOL handleDoubleClick(S32 x, S32 y, MASK mask); + virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask); + virtual BOOL handleDoubleClick(S32 x, S32 y, MASK mask); static void pickCallback(const LLPickInfo& pick_info); }; @@ -150,9 +150,9 @@ public: virtual ~LLToolCompScale(); // Overridden from LLToolComposite - virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask); - virtual BOOL handleDoubleClick(S32 x, S32 y, MASK mask); - virtual BOOL handleHover(S32 x, S32 y, MASK mask); + virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask); + virtual BOOL handleDoubleClick(S32 x, S32 y, MASK mask); + virtual BOOL handleHover(S32 x, S32 y, MASK mask); virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask); // Returns to the default tool virtual void render(); @@ -172,9 +172,9 @@ public: virtual ~LLToolCompRotate(); // Overridden from LLToolComposite - virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask); - virtual BOOL handleDoubleClick(S32 x, S32 y, MASK mask); - virtual BOOL handleHover(S32 x, S32 y, MASK mask); + virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask); + virtual BOOL handleDoubleClick(S32 x, S32 y, MASK mask); + virtual BOOL handleHover(S32 x, S32 y, MASK mask); virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask); virtual void render(); @@ -195,14 +195,14 @@ public: virtual ~LLToolCompCreate(); // Overridden from LLToolComposite - virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask); - virtual BOOL handleDoubleClick(S32 x, S32 y, MASK mask); + virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask); + virtual BOOL handleDoubleClick(S32 x, S32 y, MASK mask); virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask); static void pickCallback(const LLPickInfo& pick_info); protected: LLToolPlacer* mPlacer; - BOOL mObjectPlacedOnMouseDown; + BOOL mObjectPlacedOnMouseDown; }; @@ -220,7 +220,7 @@ public: virtual ~LLToolCompGun(); // Overridden from LLToolComposite - virtual BOOL handleHover(S32 x, S32 y, MASK mask); + virtual BOOL handleHover(S32 x, S32 y, MASK mask); virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask); virtual BOOL handleDoubleClick(S32 x, S32 y, MASK mask); virtual BOOL handleRightMouseDown(S32 x, S32 y, MASK mask); diff --git a/linden/indra/newview/qtoolalign.cpp b/linden/indra/newview/qtoolalign.cpp index 3fe31f7..cb32d0d 100644 --- a/linden/indra/newview/qtoolalign.cpp +++ b/linden/indra/newview/qtoolalign.cpp @@ -46,7 +46,6 @@ QToolAlign::~QToolAlign() } - BOOL QToolAlign::handleMouseDown(S32 x, S32 y, MASK mask) { if (mHighlightedAxis != -1) @@ -105,7 +104,6 @@ void QToolAlign::pickCallback(const LLPickInfo& pick_info) } - void QToolAlign::handleSelect() { // no parts, please @@ -207,7 +205,6 @@ BOOL QToolAlign::handleHover(S32 x, S32 y, MASK mask) } - void setup_transforms_bbox(LLBBox bbox) { // translate to center @@ -242,6 +239,7 @@ void render_bbox(LLBBox bbox) gGL.popMatrix(); } + void render_cone_bbox(LLBBox bbox) { glMatrixMode(GL_MODELVIEW); @@ -256,7 +254,6 @@ void render_cone_bbox(LLBBox bbox) } - // the selection bbox isn't axis aligned, so we must construct one // should this be cached in the selection manager? yes. LLBBox get_selection_axis_aligned_bbox() @@ -288,7 +285,6 @@ LLBBox get_selection_axis_aligned_bbox() } - void QToolAlign::computeManipulatorSize() { if (LLSelectMgr::getInstance()->getSelection()->getSelectType() == SELECT_TYPE_HUD) @@ -407,6 +403,7 @@ void QToolAlign::render() } } + // only works for our specialized (AABB, position centered) bboxes BOOL bbox_overlap(LLBBox bbox1, LLBBox bbox2) { @@ -422,7 +419,6 @@ BOOL bbox_overlap(LLBBox bbox1, LLBBox bbox2) } - // used to sort bboxes before packing class BBoxCompare { @@ -598,5 +594,3 @@ void QToolAlign::align() LLSelectMgr::getInstance()->sendMultipleUpdate(UPD_POSITION); } - - -- cgit v1.1