1 files changed, 28 insertions, 25 deletions

diff --git a/linden/indra/newview/llmanip.cpp b/linden/indra/newview/llmanip.cpp
index 5c19685..89f13fe 100644
--- a/linden/indra/newview/llmanip.cpp
+++ b/linden/indra/newview/llmanip.cpp
@@ -92,11 +92,12 @@ void LLManip::rebuild(LLViewerObject* vobj)
 // LLManip
 
 
-LLManip::LLManip( const LLString& name, LLToolComposite* composite )
+LLManip::LLManip( const std::string& name, LLToolComposite* composite )
         :
         LLTool( name, composite ),
         mInSnapRegime(FALSE),
-        mHighlightedPart(LL_NO_PART)
+        mHighlightedPart(LL_NO_PART),
+        mManipPart(LL_NO_PART)
 {
 }
 
@@ -177,7 +178,7 @@ F32 LLManip::getSubdivisionLevel(const LLVector3 &reference_point, const LLVecto
         LLVector3 cam_to_reference;
         if (mObjectSelection->getSelectType() == SELECT_TYPE_HUD)
         {
-                cam_to_reference = LLVector3(1.f / gAgent.getAvatarObject()->mHUDCurZoom, 0.f, 0.f);
+                cam_to_reference = LLVector3(1.f / gAgent.mHUDCurZoom, 0.f, 0.f);
         }
         else
         {
@@ -199,6 +200,8 @@ void LLManip::handleSelect()
 
 void LLManip::handleDeselect()
 {
+        mHighlightedPart = LL_NO_PART;
+        mManipPart = LL_NO_PART;
         mObjectSelection = NULL;
 }
 
@@ -260,8 +263,8 @@ BOOL LLManip::getMousePointOnPlaneGlobal(LLVector3d& point, S32 x, S32 y, LLVect
         if (mObjectSelection->getSelectType() == SELECT_TYPE_HUD)
         {
                 BOOL result = FALSE;
-                F32 mouse_x = ((F32)x / gViewerWindow->getWindowWidth() - 0.5f) * LLViewerCamera::getInstance()->getAspect() / gAgent.getAvatarObject()->mHUDCurZoom;
-                F32 mouse_y = ((F32)y / gViewerWindow->getWindowHeight() - 0.5f) / gAgent.getAvatarObject()->mHUDCurZoom;
+                F32 mouse_x = ((F32)x / gViewerWindow->getWindowWidth() - 0.5f) * LLViewerCamera::getInstance()->getAspect() / gAgent.mHUDCurZoom;
+                F32 mouse_y = ((F32)y / gViewerWindow->getWindowHeight() - 0.5f) / gAgent.mHUDCurZoom;
 
                 LLVector3 origin_agent = gAgent.getPosAgentFromGlobal(origin);
                 LLVector3 mouse_pos = LLVector3(0.f, -mouse_x, mouse_y);
@@ -299,8 +302,8 @@ BOOL LLManip::nearestPointOnLineFromMouse( S32 x, S32 y, const LLVector3& b1, co
 
         if (mObjectSelection->getSelectType() == SELECT_TYPE_HUD)
         {
-                F32 mouse_x = (((F32)x / gViewerWindow->getWindowWidth()) - 0.5f) * LLViewerCamera::getInstance()->getAspect() / gAgent.getAvatarObject()->mHUDCurZoom;
-                F32 mouse_y = (((F32)y / gViewerWindow->getWindowHeight()) - 0.5f) / gAgent.getAvatarObject()->mHUDCurZoom;
+                F32 mouse_x = (((F32)x / gViewerWindow->getWindowWidth()) - 0.5f) * LLViewerCamera::getInstance()->getAspect() / gAgent.mHUDCurZoom;
+                F32 mouse_y = (((F32)y / gViewerWindow->getWindowHeight()) - 0.5f) / gAgent.mHUDCurZoom;
                 a1 = LLVector3(llmin(b1.mV[VX] - 0.1f, b2.mV[VX] - 0.1f, 0.f), -mouse_x, mouse_y);
                 a2 = a1 + LLVector3(1.f, 0.f, 0.f);
         }
@@ -422,7 +425,7 @@ void LLManip::renderGuidelines(BOOL draw_x, BOOL draw_y, BOOL draw_z)
 void LLManip::renderXYZ(const LLVector3 &vec) 
 {
         const S32 PAD = 10;
-        char feedback_string[128];              /*Flawfinder: ignore*/
+        std::string feedback_string;
         LLVector3 camera_pos = LLViewerCamera::getInstance()->getOrigin() + LLViewerCamera::getInstance()->getAtAxis();
         S32 vertical_offset = gViewerWindow->getWindowHeight() / 2 - VERTICAL_OFFSET;
         S32 window_center_x = gViewerWindow->getWindowWidth() / 2;
@@ -451,30 +454,30 @@ void LLManip::renderXYZ(const LLVector3 &vec)
                 LLLocale locale(LLLocale::USER_LOCALE);
                 LLGLDepthTest gls_depth(GL_FALSE);
                 // render drop shadowed text
-                snprintf(feedback_string, sizeof(feedback_string), "X: %.3f", vec.mV[VX]);                      /* Flawfinder: ignore */
+                feedback_string = llformat("X: %.3f", vec.mV[VX]);
                 hud_render_text(utf8str_to_wstring(feedback_string), camera_pos, *LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF ), LLFontGL::NORMAL, -102.f + 1.f, (F32)vertical_offset - 1.f, LLColor4::black, FALSE);
 
-                snprintf(feedback_string, sizeof(feedback_string), "Y: %.3f", vec.mV[VY]);                      /* Flawfinder: ignore */
+                feedback_string = llformat("Y: %.3f", vec.mV[VY]);
                 hud_render_text(utf8str_to_wstring(feedback_string), camera_pos, *LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF ), LLFontGL::NORMAL, -27.f + 1.f, (F32)vertical_offset - 1.f, LLColor4::black, FALSE);
                 
-                snprintf(feedback_string, sizeof(feedback_string), "Z: %.3f", vec.mV[VZ]);                      /* Flawfinder: ignore */
+                feedback_string = llformat("Z: %.3f", vec.mV[VZ]);
                 hud_render_text(utf8str_to_wstring(feedback_string), camera_pos, *LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF ), LLFontGL::NORMAL, 48.f + 1.f, (F32)vertical_offset - 1.f, LLColor4::black, FALSE);
 
                 // render text on top
-                snprintf(feedback_string, sizeof(feedback_string), "X: %.3f", vec.mV[VX]);                      /* Flawfinder: ignore */
+                feedback_string = llformat("X: %.3f", vec.mV[VX]);
                 hud_render_text(utf8str_to_wstring(feedback_string), camera_pos, *LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF ), LLFontGL::NORMAL, -102.f, (F32)vertical_offset, LLColor4(1.f, 0.5f, 0.5f, 1.f), FALSE);
 
                 glColor3f(0.5f, 1.f, 0.5f);
-                snprintf(feedback_string, sizeof(feedback_string), "Y: %.3f", vec.mV[VY]);                      /* Flawfinder: ignore */
+                feedback_string = llformat("Y: %.3f", vec.mV[VY]);
                 hud_render_text(utf8str_to_wstring(feedback_string), camera_pos, *LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF ), LLFontGL::NORMAL, -27.f, (F32)vertical_offset, LLColor4(0.5f, 1.f, 0.5f, 1.f), FALSE);
                 
                 glColor3f(0.5f, 0.5f, 1.f);
-                snprintf(feedback_string, sizeof(feedback_string), "Z: %.3f", vec.mV[VZ]);                      /* Flawfinder: ignore */
+                feedback_string = llformat("Z: %.3f", vec.mV[VZ]);
                 hud_render_text(utf8str_to_wstring(feedback_string), camera_pos, *LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF ), LLFontGL::NORMAL, 48.f, (F32)vertical_offset, LLColor4(0.5f, 0.5f, 1.f, 1.f), FALSE);
         }
 }
 
-void LLManip::renderTickText(const LLVector3& pos, const char* text, const LLColor4 &color)
+void LLManip::renderTickText(const LLVector3& pos, const std::string& text, const LLColor4 &color)
 {
         const LLFontGL* big_fontp = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF );
 
@@ -484,7 +487,7 @@ void LLManip::renderTickText(const LLVector3& pos, const char* text, const LLCol
         LLVector3 render_pos = pos;
         if (hud_selection)
         {
-                F32 zoom_amt = gAgent.getAvatarObject()->mHUDCurZoom;
+                F32 zoom_amt = gAgent.mHUDCurZoom;
                 F32 inv_zoom_amt = 1.f / zoom_amt;
                 // scale text back up to counter-act zoom level
                 render_pos = pos * zoom_amt;
@@ -502,37 +505,37 @@ void LLManip::renderTickText(const LLVector3& pos, const char* text, const LLCol
         glPopMatrix();
 }
 
-void LLManip::renderTickValue(const LLVector3& pos, F32 value, const char* suffix, const LLColor4 &color)
+void LLManip::renderTickValue(const LLVector3& pos, F32 value, const std::string& suffix, const LLColor4 &color)
 {
         LLLocale locale(LLLocale::USER_LOCALE);
 
         const LLFontGL* big_fontp = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF );
         const LLFontGL* small_fontp = LLResMgr::getInstance()->getRes( LLFONT_SANSSERIF_SMALL );
 
-        char val_string[128];           /*Flawfinder: ignore*/
-        char fraction_string[128];              /*Flawfinder: ignore*/
+        std::string val_string;
+        std::string fraction_string;
         F32 val_to_print = llround(value, 0.001f);
         S32 fractional_portion = llround(fmodf(llabs(val_to_print), 1.f) * 100.f);
         if (val_to_print < 0.f)
         {
                 if (fractional_portion == 0)
                 {
-                        snprintf(val_string, sizeof(val_string), "-%d%s", lltrunc(llabs(val_to_print)), suffix);                        /* Flawfinder: ignore */
+                        val_string = llformat("-%d%s", lltrunc(llabs(val_to_print)), suffix.c_str());
                 }
                 else
                 {
-                        snprintf(val_string, sizeof(val_string), "-%d", lltrunc(llabs(val_to_print)));                  /* Flawfinder: ignore */
+                        val_string = llformat("-%d", lltrunc(llabs(val_to_print)));
                 }
         }
         else
         {
                 if (fractional_portion == 0)
                 {
-                        snprintf(val_string, sizeof(val_string), "%d%s", lltrunc(llabs(val_to_print)), suffix);                 /* Flawfinder: ignore */
+                        val_string = llformat("%d%s", lltrunc(llabs(val_to_print)), suffix.c_str());
                 }
                 else
                 {
-                        snprintf(val_string, sizeof(val_string), "%d", lltrunc(val_to_print));                  /* Flawfinder: ignore */
+                        val_string = llformat("%d", lltrunc(val_to_print));
                 }
         }
 
@@ -542,7 +545,7 @@ void LLManip::renderTickValue(const LLVector3& pos, F32 value, const char* suffi
         LLVector3 render_pos = pos;
         if (hud_selection)
         {
-                F32 zoom_amt = gAgent.getAvatarObject()->mHUDCurZoom;
+                F32 zoom_amt = gAgent.mHUDCurZoom;
                 F32 inv_zoom_amt = 1.f / zoom_amt;
                 // scale text back up to counter-act zoom level
                 render_pos = pos * zoom_amt;
@@ -554,7 +557,7 @@ void LLManip::renderTickValue(const LLVector3& pos, F32 value, const char* suffi
 
         if (fractional_portion != 0)
         {
-                snprintf(fraction_string, sizeof(fraction_string), "%c%02d%s", LLResMgr::getInstance()->getDecimalPoint(), fractional_portion, suffix);                 /* Flawfinder: ignore */
+                fraction_string = llformat("%c%02d%s", LLResMgr::getInstance()->getDecimalPoint(), fractional_portion, suffix.c_str());
 
                 gViewerWindow->setupViewport(1, -1);
                 hud_render_utf8text(val_string, render_pos, *big_fontp, LLFontGL::NORMAL, -1.f * big_fontp->getWidthF32(val_string), 3.f, shadow_color, hud_selection);