diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-02-27 09:03:04 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-02-27 09:03:04 -0500 |
| commit | 83851db09ab0fecbb6722826055a55844fd98ea6 (patch) | |
| tree | b3c73b1dec463e4d8a8a315f1d713a83e119d99b /indra/newview/llmanipscale.h | |
| parent | bdb42b4c716a374ab7a7b54a630ed5b5a481cdb2 (diff) | |
| parent | d4a2e9fd9a0e7001a6c824ddd6cf37039a632b9d (diff) | |
merge up to 3.7.25-release
Diffstat (limited to 'indra/newview/llmanipscale.h')
| -rwxr-xr-x | indra/newview/llmanipscale.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llmanipscale.h b/indra/newview/llmanipscale.h index 7cc3c99810..11ade9b7d0 100755 --- a/indra/newview/llmanipscale.h +++ b/indra/newview/llmanipscale.h @@ -96,7 +96,6 @@ public: private: void renderCorners( const LLBBox& local_bbox ); void renderFaces( const LLBBox& local_bbox ); - void renderEdges( const LLBBox& local_bbox ); void renderBoxHandle( F32 x, F32 y, F32 z ); void renderAxisHandle( U32 part, const LLVector3& start, const LLVector3& end ); void renderGuidelinesPart( const LLBBox& local_bbox ); @@ -172,6 +171,9 @@ private: ESnapRegimes mSnapRegime; //<! Which, if any, snap regime the cursor is currently residing in. F32 mManipulatorScales[NUM_MANIPULATORS]; F32 mBoxHandleSize[NUM_MANIPULATORS]; // The size of the handles at the corners of the bounding box + S32 mFirstClickX; + S32 mFirstClickY; + bool mIsFirstClick; }; #endif // LL_MANIPSCALE_H |