aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llmanip.h
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llmanip.h')
-rw-r--r--linden/indra/newview/llmanip.h13
1 files changed, 13 insertions, 0 deletions
diff --git a/linden/indra/newview/llmanip.h b/linden/indra/newview/llmanip.h
index cdf6a36..38672fe 100644
--- a/linden/indra/newview/llmanip.h
+++ b/linden/indra/newview/llmanip.h
@@ -151,6 +151,13 @@ protected:
151 BOOL getMousePointOnPlaneAgent(LLVector3& point, S32 x, S32 y, LLVector3 origin, LLVector3 normal); 151 BOOL getMousePointOnPlaneAgent(LLVector3& point, S32 x, S32 y, LLVector3 origin, LLVector3 normal);
152 BOOL nearestPointOnLineFromMouse( S32 x, S32 y, const LLVector3& b1, const LLVector3& b2, F32 &a_param, F32 &b_param ); 152 BOOL nearestPointOnLineFromMouse( S32 x, S32 y, const LLVector3& b1, const LLVector3& b2, F32 &a_param, F32 &b_param );
153 LLColor4 setupSnapGuideRenderPass(S32 pass); 153 LLColor4 setupSnapGuideRenderPass(S32 pass);
154private:
155 static void initPivot();
156 static void updateActualRoot(const LLSD &data);
157 static void updatePivotIsPercent(const LLSD &data);
158 static void updatePivotX(const LLSD &data);
159 static void updatePivotY(const LLSD &data);
160 static void updatePivotZ(const LLSD &data);
154protected: 161protected:
155 LLFrameTimer mHelpTextTimer; 162 LLFrameTimer mHelpTextTimer;
156 BOOL mInSnapRegime; 163 BOOL mInSnapRegime;
@@ -165,6 +172,12 @@ protected:
165 static F32 sGridMaxSubdivisionLevel; 172 static F32 sGridMaxSubdivisionLevel;
166 static F32 sGridMinSubdivisionLevel; 173 static F32 sGridMinSubdivisionLevel;
167 static LLVector2 sTickLabelSpacing; 174 static LLVector2 sTickLabelSpacing;
175
176 static bool sActualRoot;
177 static bool sPivotPerc;
178 static F32 sPivotX;
179 static F32 sPivotY;
180 static F32 sPivotZ;
168}; 181};
169 182
170 183