summaryrefslogtreecommitdiff
path: root/indra/newview/llmanip.h
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llmanip.h')
-rw-r--r--indra/newview/llmanip.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/indra/newview/llmanip.h b/indra/newview/llmanip.h
index 69881e8589..0d31d3af54 100644
--- a/indra/newview/llmanip.h
+++ b/indra/newview/llmanip.h
@@ -117,16 +117,16 @@ public:
LLManip( const std::string& name, LLToolComposite* composite );
- virtual BOOL handleMouseDownOnPart(S32 x, S32 y, MASK mask) = 0;
- void renderGuidelines(BOOL draw_x = TRUE, BOOL draw_y = TRUE, BOOL draw_z = TRUE);
+ virtual bool handleMouseDownOnPart(S32 x, S32 y, MASK mask) = 0;
+ void renderGuidelines(bool draw_x = true, bool draw_y = true, bool draw_z = true);
static void renderXYZ(const LLVector3 &vec);
- /*virtual*/ BOOL handleMouseUp(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*/ bool handleHover(S32 x, S32 y, MASK mask);
virtual void highlightManipulators(S32 x, S32 y) = 0;
virtual void handleSelect();
virtual void handleDeselect();
- virtual BOOL canAffectSelection() = 0;
+ virtual bool canAffectSelection() = 0;
EManipPart getHighlightedPart() { return mHighlightedPart; }
@@ -136,18 +136,18 @@ protected:
LLVector3 getSavedPivotPoint() const;
LLVector3 getPivotPoint();
void getManipNormal(LLViewerObject* object, EManipPart manip, LLVector3 &normal);
- BOOL getManipAxis(LLViewerObject* object, EManipPart manip, LLVector3 &axis);
+ bool getManipAxis(LLViewerObject* object, EManipPart manip, LLVector3 &axis);
F32 getSubdivisionLevel(const LLVector3 &reference_point, const LLVector3 &translate_axis, F32 grid_scale, S32 min_pixel_spacing = MIN_DIVISION_PIXEL_WIDTH, F32 min_subdivisions = sGridMinSubdivisionLevel, F32 max_subdivisions = sGridMaxSubdivisionLevel);
void renderTickValue(const LLVector3& pos, F32 value, const std::string& suffix, const LLColor4 &color);
void renderTickText(const LLVector3& pos, const std::string& suffix, const LLColor4 &color);
void updateGridSettings();
- BOOL getMousePointOnPlaneGlobal(LLVector3d& point, S32 x, S32 y, LLVector3d origin, LLVector3 normal) const;
- BOOL getMousePointOnPlaneAgent(LLVector3& point, S32 x, S32 y, LLVector3 origin, LLVector3 normal);
- BOOL nearestPointOnLineFromMouse( S32 x, S32 y, const LLVector3& b1, const LLVector3& b2, F32 &a_param, F32 &b_param );
+ bool getMousePointOnPlaneGlobal(LLVector3d& point, S32 x, S32 y, LLVector3d origin, LLVector3 normal) const;
+ bool getMousePointOnPlaneAgent(LLVector3& point, S32 x, S32 y, LLVector3 origin, LLVector3 normal);
+ bool nearestPointOnLineFromMouse( S32 x, S32 y, const LLVector3& b1, const LLVector3& b2, F32 &a_param, F32 &b_param );
LLColor4 setupSnapGuideRenderPass(S32 pass);
protected:
LLFrameTimer mHelpTextTimer;
- BOOL mInSnapRegime;
+ bool mInSnapRegime;
LLSafeHandle<LLObjectSelection> mObjectSelection;
EManipPart mHighlightedPart;
EManipPart mManipPart;