Print done when done.

1 files changed, 2126 insertions, 0 deletions

diff --git a/indra/newview/llmaniptranslate.cpp b/indra/newview/llmaniptranslate.cpp
new file mode 100644
index 0000000000..3db23c06ca
--- /dev/null
+++ b/indra/newview/llmaniptranslate.cpp
@@ -0,0 +1,2126 @@
+/** 
+ * @file llmaniptranslate.cpp
+ * @brief LLManipTranslate class implementation
+ *
+ * Copyright (c) 2002-$CurrentYear$, Linden Research, Inc.
+ * $License$
+ */
+
+/**
+ * Positioning tool
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llmaniptranslate.h"
+
+#include "llgl.h"
+
+#include "llagent.h"
+#include "llbbox.h"
+#include "llbox.h"
+#include "llviewercontrol.h"
+#include "llcriticaldamp.h"
+#include "llcylinder.h"
+#include "lldrawable.h"
+#include "llfloatertools.h"
+#include "llfontgl.h"
+#include "llglheaders.h"
+#include "llhudrender.h"
+#include "llresmgr.h"
+#include "llselectmgr.h"
+#include "llsphere.h"
+#include "llstatusbar.h"
+#include "lltoolmgr.h"
+#include "llviewercamera.h"
+#include "llviewerjoint.h"
+#include "llviewerobject.h"
+#include "llviewerwindow.h"
+#include "llvoavatar.h"
+#include "llworld.h"
+#include "viewer.h"
+#include "llui.h"
+
+const S32 NUM_AXES = 3;
+const S32 MOUSE_DRAG_SLOP = 2;       // pixels
+const F32 HANDLE_HIDE_ANGLE = 0.15f; // radians
+const F32 SELECTED_ARROW_SCALE = 1.3f;
+const F32 MANIPULATOR_HOTSPOT_START = 0.2f;
+const F32 MANIPULATOR_HOTSPOT_END = 1.2f;
+const F32 SNAP_GUIDE_SCREEN_SIZE = 0.7f;
+const F32 MIN_PLANE_MANIP_DOT_PRODUCT = 0.25f;
+const F32 PLANE_TICK_SIZE = 0.4f;
+const F32 MANIPULATOR_SCALE_HALF_LIFE = 0.07f;
+const F32 SNAP_ARROW_SCALE = 0.7f;
+
+static GLuint sGridTex = 0;
+
+const LLManip::EManipPart MANIPULATOR_IDS[9] = 
+{
+	LLManip::LL_X_ARROW,
+	LLManip::LL_Y_ARROW,
+	LLManip::LL_Z_ARROW,
+	LLManip::LL_X_ARROW,
+	LLManip::LL_Y_ARROW,
+	LLManip::LL_Z_ARROW,
+	LLManip::LL_YZ_PLANE,
+	LLManip::LL_XZ_PLANE,
+	LLManip::LL_XY_PLANE
+};
+
+const U32 ARROW_TO_AXIS[4] = 
+{
+	VX,
+	VX,
+	VY,
+	VZ
+};
+
+BOOL sort_manip_by_end_z(LLManipTranslate::ManipulatorHandle *new_manip, LLManipTranslate::ManipulatorHandle *test_manip)
+{
+	return (new_manip->mEndPosition.mV[VZ] < test_manip->mEndPosition.mV[VZ]);
+}
+
+LLManipTranslate::LLManipTranslate( LLToolComposite* composite )
+:	LLManip( "Move", composite ),
+	mLastHoverMouseX(-1),
+	mLastHoverMouseY(-1),
+	mSendUpdateOnMouseUp(FALSE),
+	mMouseOutsideSlop(FALSE),
+	mCopyMadeThisDrag(FALSE),
+	mMouseDownX(-1),
+	mMouseDownY(-1),
+	mAxisArrowLength(50),
+	mConeSize(0),
+	mArrowLengthMeters(0.f),
+	mPlaneManipOffsetMeters(0.f),
+	mManipPart(LL_NO_PART),
+	mUpdateTimer(),
+	mSnapOffsetMeters(0.f),
+	mArrowScales(1.f, 1.f, 1.f),
+	mPlaneScales(1.f, 1.f, 1.f),
+	mPlaneManipPositions(1.f, 1.f, 1.f, 1.f)
+{ 
+	mProjectedManipulators.setInsertBefore(sort_manip_by_end_z);
+
+	if (sGridTex == 0)
+	{ 
+		restoreGL();
+	}
+}
+
+//static
+void LLManipTranslate::restoreGL()
+{
+	//generate grid texture
+	U32 rez = 512;
+	U32 mip = 0;
+
+	GLuint* d = new GLuint[rez*rez];
+	LLGLEnable tex2d(GL_TEXTURE_2D);
+	glGenTextures(1, &sGridTex);
+	glBindTexture(GL_TEXTURE_2D, sGridTex);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+
+	while (rez >= 1)
+	{
+		for (U32 i = 0; i < rez*rez; i++)
+		{
+			d[i] = 0x00FFFFFF;
+		}
+		
+		U32 subcol = 0xFFFFFFFF;
+		if (rez >= 4)
+		{	//large grain grid
+			for (U32 i = 0; i < rez; i++)
+			{
+				if (rez <= 16)
+				{
+					if (rez == 16)
+					{
+						subcol = 0xA0FFFFFF;
+					}
+					else if (rez == 8)
+					{
+						subcol = 0x80FFFFFF;
+					}
+					else
+					{
+						subcol = 0x40FFFFFF;
+					}
+				}
+				else
+				{
+					subcol = 0xFFFFFFFF;	
+				}
+				d[i			*rez+ 0		 ] = subcol;
+				d[0			*rez+ i		 ] = subcol;				
+				if (rez >= 32)
+				{
+					d[i			*rez+ (rez-1)] = subcol;
+					d[(rez-1)	*rez+ i		 ] = subcol;
+				}
+
+				if (rez >= 64)
+				{
+					subcol = 0xFFFFFFFF;
+					
+					if (i > 0 && i < (rez-1))
+					{
+						d[i			*rez+ 1		 ] = subcol;
+						d[i			*rez+ (rez-2)] = subcol;
+						d[1			*rez+ i		 ] = subcol;
+						d[(rez-2)	*rez+ i		 ] = subcol;
+					}
+				}
+			}
+		}
+
+		subcol = 0x50A0A0A0;
+		if (rez >= 128)
+		{ //small grain grid
+			for (U32 i = 8; i < rez; i+=8)
+			{
+				for (U32 j = 2; j < rez-2; j++)
+				{
+					d[i	*rez+ j] = subcol;
+					d[j	*rez+ i] = subcol;			
+				}
+			}
+		}
+		if (rez >= 64)
+		{ //medium grain grid
+			if (rez == 64)
+			{
+				subcol = 0x50A0A0A0;
+			}
+			else
+			{
+				subcol = 0xA0D0D0D0;
+			}
+
+			for (U32 i = 32; i < rez; i+=32)
+			{
+				U32 pi = i-1;
+				for (U32 j = 2; j < rez-2; j++)
+				{
+					d[i		*rez+ j] = subcol;
+					d[j		*rez+ i] = subcol;
+
+					if (rez > 128)
+					{
+						d[pi	*rez+ j] = subcol;
+						d[j		*rez+ pi] = subcol;			
+					}
+				}
+			}
+		}
+#ifdef LL_WINDOWS
+		glTexImage2D(GL_TEXTURE_2D, mip, GL_RGBA, rez, rez, 0, GL_RGBA, GL_UNSIGNED_BYTE, d);
+#else
+		glTexImage2D(GL_TEXTURE_2D, mip, GL_RGBA, rez, rez, 0, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8_REV, d);
+#endif
+		rez = rez >> 1;
+		mip++;
+	}
+	delete [] d;
+}
+
+
+LLManipTranslate::~LLManipTranslate()
+{
+	mProjectedManipulators.deleteAllData();
+}
+
+
+void LLManipTranslate::handleSelect()
+{
+	gSelectMgr->saveSelectedObjectTransform(SELECT_ACTION_TYPE_PICK);
+	gFloaterTools->setStatusText("Drag to move, shift-drag to copy");
+}
+
+void LLManipTranslate::handleDeselect()
+{
+	mHighlightedPart = LL_NO_PART;
+	mManipPart = LL_NO_PART;
+	gFloaterTools->setStatusText("");
+}
+
+BOOL LLManipTranslate::handleMouseDown(S32 x, S32 y, MASK mask)
+{
+	BOOL	handled = FALSE;
+
+	// didn't click in any UI object, so must have clicked in the world
+	LLViewerObject* hit_obj = gViewerWindow->lastObjectHit();
+	if( hit_obj && 
+		(mHighlightedPart == LL_X_ARROW ||
+		 mHighlightedPart == LL_Y_ARROW ||
+		 mHighlightedPart == LL_Z_ARROW ||
+		 mHighlightedPart == LL_YZ_PLANE ||
+		 mHighlightedPart == LL_XZ_PLANE ||
+		 mHighlightedPart == LL_XY_PLANE ) )
+	{
+		handled = handleMouseDownOnPart( x, y, mask );
+	}
+
+	return handled;
+}
+
+// Assumes that one of the arrows on an object was hit.
+BOOL LLManipTranslate::handleMouseDownOnPart( S32 x, S32 y, MASK mask )
+{
+	BOOL can_move = gSelectMgr->getObjectCount() != 0;
+	for (LLViewerObject* objectp = gSelectMgr->getFirstObject();
+		objectp;
+		objectp = gSelectMgr->getNextObject())
+	{
+		can_move = can_move && objectp->permMove() && (objectp->permModify() || gSavedSettings.getBOOL("SelectLinkedSet"));
+	}
+
+	if (!can_move)
+	{
+		return FALSE;
+	}
+
+	highlightManipulators(x, y);
+	S32 hit_part = mHighlightedPart;
+
+	if( (hit_part != LL_X_ARROW) && 
+		(hit_part != LL_Y_ARROW) &&
+		(hit_part != LL_Z_ARROW) &&
+		(hit_part != LL_YZ_PLANE) &&
+		(hit_part != LL_XZ_PLANE) &&
+		(hit_part != LL_XY_PLANE) )
+	{
+		return TRUE;
+	}
+
+	mHelpTextTimer.reset();
+	sNumTimesHelpTextShown++;
+
+	gSelectMgr->getGrid(mGridOrigin, mGridRotation, mGridScale);
+
+	gSelectMgr->enableSilhouette(FALSE);
+
+	// we just started a drag, so save initial object positions
+	gSelectMgr->saveSelectedObjectTransform(SELECT_ACTION_TYPE_MOVE);
+
+	mManipPart = (EManipPart)hit_part;
+	mMouseDownX = x;
+	mMouseDownY = y;
+	mMouseOutsideSlop = FALSE;
+
+	LLVector3		axis;
+
+	LLSelectNode *selectNode = gSelectMgr->getFirstMoveableNode(TRUE);
+
+	if (!selectNode)
+	{
+		// didn't find the object in our selection...oh well
+		llwarns << "Trying to translate an unselected object" << llendl;
+		return TRUE;
+	}
+
+	LLViewerObject *selected_object = selectNode->getObject();
+	if (!selected_object)
+	{
+		// somehow we lost the object!
+		llwarns << "Translate manip lost the object" << llendl;
+		gViewerWindow->setCursor(UI_CURSOR_TOOLTRANSLATE);
+		return TRUE;
+	}
+
+	// Compute unit vectors for arrow hit and a plane through that vector
+	BOOL axis_exists = getManipAxis(selected_object, mManipPart, axis);
+	getManipNormal(selected_object, mManipPart, mManipNormal);
+
+	//LLVector3 select_center_agent = gAgent.getPosAgentFromGlobal(gSelectMgr->getSelectionCenterGlobal());
+	// TomY: The above should (?) be identical to the below
+	LLVector3 select_center_agent = getPivotPoint();
+	mSubdivisions = llclamp(getSubdivisionLevel(select_center_agent, axis_exists ? axis : LLVector3::z_axis, getMinGridScale()), sGridMinSubdivisionLevel, sGridMaxSubdivisionLevel);
+
+	// if we clicked on a planar manipulator, recenter mouse cursor
+	if (mManipPart >= LL_YZ_PLANE && mManipPart <= LL_XY_PLANE)
+	{
+		LLCoordGL mouse_pos;
+		gCamera->projectPosAgentToScreen(select_center_agent, mouse_pos);
+
+		if (gSavedSettings.getBOOL("SnapToMouseCursor"))
+		{
+			LLUI::setCursorPositionScreen(mouse_pos.mX, mouse_pos.mY);
+			x = mouse_pos.mX;
+			y = mouse_pos.mY;
+		}
+	}
+
+	gSelectMgr->updateSelectionCenter();
+	LLVector3d object_start_global = gAgent.getPosGlobalFromAgent(getPivotPoint());
+	getMousePointOnPlaneGlobal(mDragCursorStartGlobal, x, y, object_start_global, mManipNormal);
+	mDragSelectionStartGlobal = object_start_global;
+	mCopyMadeThisDrag = FALSE;
+
+	// Route future Mouse messages here preemptively.  (Release on mouse up.)
+	setMouseCapture( TRUE );
+
+	return TRUE;
+}
+
+BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask)
+{
+	// Translation tool only works if mouse button is down.
+	// Bail out if mouse not down.
+	if( !hasMouseCapture() )
+	{
+		lldebugst(LLERR_USER_INPUT) << "hover handled by LLManipTranslate (inactive)" << llendl;		
+		// Always show cursor
+		// gViewerWindow->setCursor(UI_CURSOR_ARROW);
+		gViewerWindow->setCursor(UI_CURSOR_TOOLTRANSLATE);
+
+		highlightManipulators(x, y);
+		return TRUE;
+	}
+	
+	// Handle auto-rotation if necessary.
+	const F32 ROTATE_ANGLE_PER_SECOND = 30.f * DEG_TO_RAD;
+	const S32 ROTATE_H_MARGIN = gViewerWindow->getWindowWidth() / 20;
+	const F32 rotate_angle = ROTATE_ANGLE_PER_SECOND / gFPSClamped;
+	BOOL rotated = FALSE;
+
+	// ...build mode moves camera about focus point
+	if (gSelectMgr->getSelectType() != SELECT_TYPE_HUD)
+	{
+		if (x < ROTATE_H_MARGIN)
+		{
+			gAgent.cameraOrbitAround(rotate_angle);
+			rotated = TRUE;
+		}
+		else if (x > gViewerWindow->getWindowWidth() - ROTATE_H_MARGIN)
+		{
+			gAgent.cameraOrbitAround(-rotate_angle);
+			rotated = TRUE;
+		}
+	}
+
+	// Suppress processing if mouse hasn't actually moved.
+	// This may cause problems if the camera moves outside of the
+	// rotation above.
+	if( x == mLastHoverMouseX && y == mLastHoverMouseY && !rotated)
+	{
+		lldebugst(LLERR_USER_INPUT) << "hover handled by LLManipTranslate (mouse unmoved)" << llendl;
+		gViewerWindow->setCursor(UI_CURSOR_TOOLTRANSLATE);
+		return TRUE;
+	}
+	mLastHoverMouseX = x;
+	mLastHoverMouseY = y;
+
+	// Suppress if mouse hasn't moved past the initial slop region
+	// Reset once we start moving
+	if( !mMouseOutsideSlop )
+	{
+		if (abs(mMouseDownX - x) < MOUSE_DRAG_SLOP && abs(mMouseDownY - y) < MOUSE_DRAG_SLOP )
+		{
+			lldebugst(LLERR_USER_INPUT) << "hover handled by LLManipTranslate (mouse inside slop)" << llendl;
+			gViewerWindow->setCursor(UI_CURSOR_TOOLTRANSLATE);
+			return TRUE;
+		}
+		else
+		{
+			// ...just went outside the slop region
+			mMouseOutsideSlop = TRUE;
+			// If holding down shift, leave behind a copy.
+			if (mask == MASK_COPY)
+			{
+				// ...we're trying to make a copy
+				gSelectMgr->selectDuplicate(LLVector3::zero, FALSE);
+				mCopyMadeThisDrag = TRUE;
+
+				// When we make the copy, we don't want to do any other processing.
+				// If so, the object will also be moved, and the copy will be offset.
+				lldebugst(LLERR_USER_INPUT) << "hover handled by LLManipTranslate (made copy)" << llendl;
+				gViewerWindow->setCursor(UI_CURSOR_TOOLTRANSLATE);
+			}
+		}
+	}
+
+	// Throttle updates to 10 per second.
+	BOOL send_update = FALSE;
+
+	LLVector3		axis_f;
+	LLVector3d		axis_d;
+	LLViewerObject	*object;
+
+	// pick the first object to constrain to grid w/ common origin
+	// this is so we don't screw up groups
+	LLSelectNode* selectNode = gSelectMgr->getFirstMoveableNode(TRUE);
+	if (!selectNode)
+	{
+		// somehow we lost the object!
+		llwarns << "Translate manip lost the object" << llendl;
+		gViewerWindow->setCursor(UI_CURSOR_TOOLTRANSLATE);
+		return TRUE;
+	}
+
+	object = selectNode->getObject();
+	if (!object)
+	{
+		// somehow we lost the object!
+		llwarns << "Translate manip lost the object" << llendl;
+		gViewerWindow->setCursor(UI_CURSOR_TOOLTRANSLATE);
+		return TRUE;
+	}
+
+	// Compute unit vectors for arrow hit and a plane through that vector
+	BOOL axis_exists = getManipAxis(object, mManipPart, axis_f);		// TODO: move this
+
+	axis_d.setVec(axis_f);
+
+	gSelectMgr->updateSelectionCenter();
+	LLVector3d current_pos_global = gAgent.getPosGlobalFromAgent(getPivotPoint());
+
+	mSubdivisions = llclamp(getSubdivisionLevel(getPivotPoint(), axis_f, getMinGridScale()), sGridMinSubdivisionLevel, sGridMaxSubdivisionLevel);
+
+	// Project the cursor onto that plane
+	LLVector3d relative_move;
+	getMousePointOnPlaneGlobal(relative_move, x, y, current_pos_global, mManipNormal);\
+	relative_move -= mDragCursorStartGlobal;
+
+	// You can't move more than some distance from your original mousedown point.
+	if (gSavedSettings.getBOOL("LimitDragDistance"))
+	{
+		F32 max_drag_distance = gSavedSettings.getF32("MaxDragDistance");
+
+		if (relative_move.magVecSquared() > max_drag_distance * max_drag_distance)
+		{
+			lldebugst(LLERR_USER_INPUT) << "hover handled by LLManipTranslate (too far)" << llendl;
+			gViewerWindow->setCursor(UI_CURSOR_NOLOCKED);
+			return TRUE;
+		}
+	}
+
+	F64 axis_magnitude = relative_move * axis_d;					// dot product
+	LLVector3d cursor_point_snap_line;
+	
+	F64 off_axis_magnitude;
+
+	getMousePointOnPlaneGlobal(cursor_point_snap_line, x, y, current_pos_global, mSnapOffsetAxis % axis_f);
+	off_axis_magnitude = axis_exists ? llabs((cursor_point_snap_line - current_pos_global) * LLVector3d(mSnapOffsetAxis)) : 0.f;
+
+	if (gSavedSettings.getBOOL("SnapEnabled"))
+	{
+		if (off_axis_magnitude > mSnapOffsetMeters)
+		{
+			mInSnapRegime = TRUE;
+			LLVector3 mouse_down_offset(mDragCursorStartGlobal - mDragSelectionStartGlobal);
+			LLVector3 cursor_snap_agent = gAgent.getPosAgentFromGlobal(cursor_point_snap_line);
+			if (!gSavedSettings.getBOOL("SnapToMouseCursor"))
+			{
+				cursor_snap_agent -= mouse_down_offset;
+			}
+
+			F32 cursor_grid_dist = (cursor_snap_agent - mGridOrigin) * axis_f;
+			
+			F32 snap_dist = getMinGridScale() / (2.f * mSubdivisions);
+			F32 relative_snap_dist = fmodf(llabs(cursor_grid_dist) + snap_dist, getMinGridScale() / mSubdivisions);
+			if (relative_snap_dist < snap_dist * 2.f)
+			{
+				if (cursor_grid_dist > 0.f)
+				{
+					cursor_grid_dist -= relative_snap_dist - snap_dist;
+				}
+				else
+				{
+					cursor_grid_dist += relative_snap_dist - snap_dist;
+				}
+			}
+
+			F32 object_start_on_axis = (gAgent.getPosAgentFromGlobal(mDragSelectionStartGlobal) - mGridOrigin) * axis_f;
+			axis_magnitude = cursor_grid_dist - object_start_on_axis;
+		}
+		else if (mManipPart >= LL_YZ_PLANE && mManipPart <= LL_XY_PLANE)
+		{
+			// subtract offset from object center
+			LLVector3d cursor_point_global;
+			getMousePointOnPlaneGlobal( cursor_point_global, x, y, current_pos_global, mManipNormal );
+			cursor_point_global -= (mDragCursorStartGlobal - mDragSelectionStartGlobal);
+
+			// snap to planar grid
+			LLVector3 cursor_point_agent = gAgent.getPosAgentFromGlobal(cursor_point_global);
+			LLVector3 camera_plane_projection = gCamera->getAtAxis();
+			camera_plane_projection -= projected_vec(camera_plane_projection, mManipNormal);
+			camera_plane_projection.normVec();
+			LLVector3 camera_projected_dir = camera_plane_projection;
+			camera_plane_projection.rotVec(~mGridRotation);
+			camera_plane_projection.scaleVec(mGridScale);
+			camera_plane_projection.abs();
+			F32 max_grid_scale;
+			if (camera_plane_projection.mV[VX] > camera_plane_projection.mV[VY] &&
+				camera_plane_projection.mV[VX] > camera_plane_projection.mV[VZ])
+			{
+				max_grid_scale = mGridScale.mV[VX];
+			}
+			else if (camera_plane_projection.mV[VY] > camera_plane_projection.mV[VZ])
+			{
+				max_grid_scale = mGridScale.mV[VY];
+			}
+			else
+			{
+				max_grid_scale = mGridScale.mV[VZ];
+			}
+
+			F32 num_subdivisions = llclamp(getSubdivisionLevel(getPivotPoint(), camera_projected_dir, max_grid_scale), sGridMinSubdivisionLevel, sGridMaxSubdivisionLevel);
+
+			F32 grid_scale_a;
+			F32 grid_scale_b;
+			LLVector3 cursor_point_grid = (cursor_point_agent - mGridOrigin) * ~mGridRotation;
+
+			switch (mManipPart)
+			{
+			case LL_YZ_PLANE:
+				grid_scale_a = mGridScale.mV[VY] / num_subdivisions;
+				grid_scale_b = mGridScale.mV[VZ] / num_subdivisions;
+				cursor_point_grid.mV[VY] -= fmod(cursor_point_grid.mV[VY] + grid_scale_a * 0.5f, grid_scale_a) - grid_scale_a * 0.5f;
+				cursor_point_grid.mV[VZ] -= fmod(cursor_point_grid.mV[VZ] + grid_scale_b * 0.5f, grid_scale_b) - grid_scale_b * 0.5f;
+				break;
+			case LL_XZ_PLANE:
+				grid_scale_a = mGridScale.mV[VX] / num_subdivisions;
+				grid_scale_b = mGridScale.mV[VZ] / num_subdivisions;
+				cursor_point_grid.mV[VX] -= fmod(cursor_point_grid.mV[VX] + grid_scale_a * 0.5f, grid_scale_a) - grid_scale_a * 0.5f;
+				cursor_point_grid.mV[VZ] -= fmod(cursor_point_grid.mV[VZ] + grid_scale_b * 0.5f, grid_scale_b) - grid_scale_b * 0.5f;
+				break;
+			case LL_XY_PLANE:
+				grid_scale_a = mGridScale.mV[VX] / num_subdivisions;
+				grid_scale_b = mGridScale.mV[VY] / num_subdivisions;
+				cursor_point_grid.mV[VX] -= fmod(cursor_point_grid.mV[VX] + grid_scale_a * 0.5f, grid_scale_a) - grid_scale_a * 0.5f;
+				cursor_point_grid.mV[VY] -= fmod(cursor_point_grid.mV[VY] + grid_scale_b * 0.5f, grid_scale_b) - grid_scale_b * 0.5f;
+				break;
+			default:
+				break;
+			}
+			cursor_point_agent = (cursor_point_grid * mGridRotation) + mGridOrigin;
+			relative_move.setVec(cursor_point_agent - gAgent.getPosAgentFromGlobal(mDragSelectionStartGlobal));
+			mInSnapRegime = TRUE;
+		}
+		else
+		{
+			mInSnapRegime = FALSE;
+		}
+	}
+	else
+	{
+		mInSnapRegime = FALSE;
+	}
+
+	// Clamp to arrow direction
+	//FIXME: does this apply anymore?
+	if (!axis_exists)
+	{
+		axis_magnitude = relative_move.normVec();
+		axis_d.setVec(relative_move);
+		axis_d.normVec();
+		axis_f.setVec(axis_d);
+	}
+
+	LLVector3d clamped_relative_move = axis_magnitude * axis_d;	// scalar multiply
+	LLVector3 clamped_relative_move_f = (F32)axis_magnitude * axis_f; // scalar multiply
+	
+	for(selectNode = gSelectMgr->getFirstNode(); 
+		selectNode; 
+		selectNode = gSelectMgr->getNextNode() )
+	{
+		object = selectNode->getObject();
+
+		// Only apply motion to root objects and objects selected
+		// as "individual".
+		if (!object->isRootEdit() && !selectNode->mIndividualSelection)
+		{
+			continue;
+		}
+
+		if (!object->isRootEdit())
+		{
+			// child objects should not update if parent is selected
+			LLViewerObject* editable_root = (LLViewerObject*)object->getParent();
+			if (editable_root->isSelected())
+			{
+				// we will be moved properly by our parent, so skip
+				continue;
+			}
+		}
+
+		if (object->permMove())
+		{
+			// handle attachments in local space
+			if (object->isAttachment() && object->mDrawable.notNull())
+			{
+				// calculate local version of relative move
+				LLQuaternion objWorldRotation = object->mDrawable->mXform.getParent()->getWorldRotation();
+				objWorldRotation.transQuat();
+
+				LLVector3 old_position_local = object->getPosition();
+				LLVector3 new_position_local = selectNode->mSavedPositionLocal + (clamped_relative_move_f * objWorldRotation);
+
+				// move and clamp root object first, before adjusting children
+				if (new_position_local != old_position_local)
+				{
+					send_update = TRUE;
+				}
+				//RN: I forget, but we need to do this because of snapping which doesn't often result
+				// in position changes even when the mouse moves
+				object->setPosition(new_position_local);
+				rebuild(object);
+				gAgent.getAvatarObject()->clampAttachmentPositions();
+				new_position_local = object->getPosition();
+
+				if (selectNode->mIndividualSelection)
+				{
+					send_update = FALSE;
+					LLVector3 child_offset = (old_position_local - new_position_local) * ~object->getRotation();
+
+					// counter-translate child objects if we are moving the root as an individual
+					for (U32 child_num = 0; child_num < object->mChildList.size(); child_num++)
+					{
+						LLViewerObject* childp = object->mChildList[child_num];
+
+						if (!childp->isSelected())
+						{
+							childp->setPosition(childp->getPosition() + child_offset);
+							rebuild(childp);
+						}
+					}
+				}
+			}
+			else
+			{
+				// compute new position to send to simulators, but don't set it yet.
+				// We need the old position to know which simulator to send the move message to.
+				LLVector3d new_position_global = selectNode->mSavedPositionGlobal + clamped_relative_move;
+
+				// Don't let object centers go too far underground
+				F64 min_height = gWorldp->getMinAllowedZ(object);
+				if (new_position_global.mdV[VZ] < min_height)
+				{
+					new_position_global.mdV[VZ] = min_height;
+				}
+
+				// For safety, cap heights where objects can be dragged
+				if (new_position_global.mdV[VZ] > MAX_OBJECT_Z)
+				{
+					new_position_global.mdV[VZ] = MAX_OBJECT_Z;
+				}
+
+				// Grass is always drawn on the ground, so clamp its position to the ground
+				if (object->getPCode() == LL_PCODE_LEGACY_GRASS)
+				{
+					new_position_global.mdV[VZ] = gWorldp->resolveLandHeightGlobal(new_position_global) + 1.f;
+				}
+				
+				if (object->isRootEdit())
+				{
+					new_position_global = gWorldp->clipToVisibleRegions(object->getPositionGlobal(), new_position_global);
+				}
+
+				// PR: Only update if changed
+				LLVector3d old_position_global = object->getPositionGlobal();
+				LLVector3 old_position_agent = object->getPositionAgent();
+				LLVector3 new_position_agent = gAgent.getPosAgentFromGlobal(new_position_global);
+				if (object->isRootEdit())
+				{
+					// finally, move parent object after children have calculated new offsets
+					object->setPositionAgent(new_position_agent);
+					rebuild(object);
+				}
+				else
+				{
+					LLViewerObject* root_object = object->getRootEdit();
+					new_position_agent -= root_object->getPositionAgent();
+					new_position_agent = new_position_agent * ~root_object->getRotation();
+					object->setPositionParent(new_position_agent, FALSE);
+					rebuild(object);
+				}
+
+				if (selectNode->mIndividualSelection)
+				{
+					LLVector3 parent_offset = (new_position_agent - old_position_agent) * ~object->getRotation();
+
+					// counter-translate child objects if we are moving the root as an individual
+					for (U32 child_num = 0; child_num < object->mChildList.size(); child_num++)
+					{
+						LLViewerObject* childp = object->mChildList[child_num];
+						if (!childp->isSelected())
+						{
+							childp->setPosition(childp->getPosition() - parent_offset);
+							rebuild(childp);
+						}
+					}
+					send_update = FALSE;
+				}
+				else if (old_position_global != new_position_global)
+				{
+					send_update = TRUE;
+				}
+			}
+		}
+	}
+
+	// Handle throttling to 10 updates per second.
+	F32 elapsed_time = mUpdateTimer.getElapsedTimeF32();
+	const F32 UPDATE_DELAY = 0.1f;						//  min time between transmitted updates
+	if (send_update && (elapsed_time > UPDATE_DELAY))
+	{
+		gSelectMgr->sendMultipleUpdate(UPD_POSITION);
+		mUpdateTimer.reset();
+		mSendUpdateOnMouseUp = FALSE;
+	}
+	else
+	{
+		// ...suppressed update
+		mSendUpdateOnMouseUp = TRUE;
+	}
+
+	gSelectMgr->updateSelectionCenter();
+	gAgent.clearFocusObject();
+	//gAgent.setObjectTracking(FALSE);
+	dialog_refresh_all();		// ??? is this necessary?
+
+	lldebugst(LLERR_USER_INPUT) << "hover handled by LLManipTranslate (active)" << llendl;
+	gViewerWindow->setCursor(UI_CURSOR_TOOLTRANSLATE);
+	return TRUE;
+}
+
+void LLManipTranslate::highlightManipulators(S32 x, S32 y)
+{
+	mHighlightedPart = LL_NO_PART;
+
+	if (!gSelectMgr->getObjectCount())
+	{
+		return;
+	}
+	
+	//LLBBox bbox = gSelectMgr->getBBoxOfSelection();
+	LLMatrix4 projMatrix = gCamera->getProjection();
+	LLMatrix4 modelView = gCamera->getModelview();
+
+	LLVector3 object_position = getPivotPoint();
+	
+	LLVector3 grid_origin;
+	LLVector3 grid_scale;
+	LLQuaternion grid_rotation;
+
+	gSelectMgr->getGrid(grid_origin, grid_rotation, grid_scale);
+
+	LLVector3 relative_camera_dir;
+
+	LLMatrix4 transform;
+
+	if (gSelectMgr->getSelectType() == SELECT_TYPE_HUD)
+	{
+		relative_camera_dir = LLVector3(1.f, 0.f, 0.f) * ~grid_rotation;
+		LLVector4 translation(object_position);
+		transform.initRotTrans(grid_rotation, translation);
+		LLMatrix4 cfr(OGL_TO_CFR_ROTATION);
+		transform *= cfr;
+		LLMatrix4 window_scale;
+		F32 zoom_level = 2.f * gAgent.getAvatarObject()->mHUDCurZoom;
+		window_scale.initAll(LLVector3(zoom_level / gCamera->getAspect(), zoom_level, 0.f),
+			LLQuaternion::DEFAULT,
+			LLVector3::zero);
+		transform *= window_scale;
+	}
+	else
+	{
+		relative_camera_dir = (object_position - gCamera->getOrigin()) * ~grid_rotation;
+		relative_camera_dir.normVec();
+
+		transform.initRotTrans(grid_rotation, LLVector4(object_position));
+		transform *= modelView;
+		transform *= projMatrix;
+	}
+		
+	mProjectedManipulators.deleteAllData();
+
+	S32 numManips = 0;
+
+	// edges
+	mManipulatorVertices[numManips++] = LLVector4(mArrowLengthMeters * MANIPULATOR_HOTSPOT_START, 0.f, 0.f, 1.f);
+	mManipulatorVertices[numManips++] = LLVector4(mArrowLengthMeters * MANIPULATOR_HOTSPOT_END, 0.f, 0.f, 1.f);
+
+	mManipulatorVertices[numManips++] = LLVector4(0.f, mArrowLengthMeters * MANIPULATOR_HOTSPOT_START, 0.f, 1.f);
+	mManipulatorVertices[numManips++] = LLVector4(0.f, mArrowLengthMeters * MANIPULATOR_HOTSPOT_END, 0.f, 1.f);
+
+	mManipulatorVertices[numManips++] = LLVector4(0.f, 0.f, mArrowLengthMeters * MANIPULATOR_HOTSPOT_START, 1.f);
+	mManipulatorVertices[numManips++] = LLVector4(0.f, 0.f, mArrowLengthMeters * MANIPULATOR_HOTSPOT_END, 1.f);
+
+	mManipulatorVertices[numManips++] = LLVector4(mArrowLengthMeters * -MANIPULATOR_HOTSPOT_START, 0.f, 0.f, 1.f);
+	mManipulatorVertices[numManips++] = LLVector4(mArrowLengthMeters * -MANIPULATOR_HOTSPOT_END, 0.f, 0.f, 1.f);
+
+	mManipulatorVertices[numManips++] = LLVector4(0.f, mArrowLengthMeters * -MANIPULATOR_HOTSPOT_START, 0.f, 1.f);
+	mManipulatorVertices[numManips++] = LLVector4(0.f, mArrowLengthMeters * -MANIPULATOR_HOTSPOT_END, 0.f, 1.f);
+
+	mManipulatorVertices[numManips++] = LLVector4(0.f, 0.f, mArrowLengthMeters * -MANIPULATOR_HOTSPOT_START, 1.f);
+	mManipulatorVertices[numManips++] = LLVector4(0.f, 0.f, mArrowLengthMeters * -MANIPULATOR_HOTSPOT_END, 1.f);
+
+	S32 num_arrow_manips = numManips;
+
+	// planar manipulators
+	BOOL planar_manip_yz_visible = FALSE;
+	BOOL planar_manip_xz_visible = FALSE;
+	BOOL planar_manip_xy_visible = FALSE;
+
+	mManipulatorVertices[numManips] = LLVector4(0.f, mPlaneManipOffsetMeters * (1.f - PLANE_TICK_SIZE * 0.5f), mPlaneManipOffsetMeters * (1.f - PLANE_TICK_SIZE * 0.5f), 1.f);
+	mManipulatorVertices[numManips++].scaleVec(mPlaneManipPositions);
+	mManipulatorVertices[numManips] = LLVector4(0.f, mPlaneManipOffsetMeters * (1.f + PLANE_TICK_SIZE * 0.5f), mPlaneManipOffsetMeters * (1.f + PLANE_TICK_SIZE * 0.5f), 1.f);
+	mManipulatorVertices[numManips++].scaleVec(mPlaneManipPositions);
+	if (llabs(relative_camera_dir.mV[VX]) > MIN_PLANE_MANIP_DOT_PRODUCT)
+	{
+		planar_manip_yz_visible = TRUE;
+	}
+
+	mManipulatorVertices[numManips] = LLVector4(mPlaneManipOffsetMeters * (1.f - PLANE_TICK_SIZE * 0.5f), 0.f, mPlaneManipOffsetMeters * (1.f - PLANE_TICK_SIZE * 0.5f), 1.f);
+	mManipulatorVertices[numManips++].scaleVec(mPlaneManipPositions);
+	mManipulatorVertices[numManips] = LLVector4(mPlaneManipOffsetMeters * (1.f + PLANE_TICK_SIZE * 0.5f), 0.f, mPlaneManipOffsetMeters * (1.f + PLANE_TICK_SIZE * 0.5f), 1.f);
+	mManipulatorVertices[numManips++].scaleVec(mPlaneManipPositions);
+	if (llabs(relative_camera_dir.mV[VY]) > MIN_PLANE_MANIP_DOT_PRODUCT)
+	{
+		planar_manip_xz_visible = TRUE;
+	}
+
+	mManipulatorVertices[numManips] = LLVector4(mPlaneManipOffsetMeters * (1.f - PLANE_TICK_SIZE * 0.5f), mPlaneManipOffsetMeters * (1.f - PLANE_TICK_SIZE * 0.5f), 0.f, 1.f);
+	mManipulatorVertices[numManips++].scaleVec(mPlaneManipPositions);
+	mManipulatorVertices[numManips] = LLVector4(mPlaneManipOffsetMeters * (1.f + PLANE_TICK_SIZE * 0.5f), mPlaneManipOffsetMeters * (1.f + PLANE_TICK_SIZE * 0.5f), 0.f, 1.f);
+	mManipulatorVertices[numManips++].scaleVec(mPlaneManipPositions);
+	if (llabs(relative_camera_dir.mV[VZ]) > MIN_PLANE_MANIP_DOT_PRODUCT)
+	{
+		planar_manip_xy_visible = TRUE;
+	}
+
+	for (S32 i = 0; i < num_arrow_manips; i+= 2)
+	{
+		LLVector4 projected_start = mManipulatorVertices[i] * transform;
+		projected_start = projected_start * (1.f / projected_start.mV[VW]);
+
+		LLVector4 projected_end = mManipulatorVertices[i + 1] * transform;
+		projected_end = projected_end * (1.f / projected_end.mV[VW]);
+
+		ManipulatorHandle* projManipulator = 
+			new ManipulatorHandle(LLVector3(projected_start.mV[VX], projected_start.mV[VY], projected_start.mV[VZ]), 
+				LLVector3(projected_end.mV[VX], projected_end.mV[VY], projected_end.mV[VZ]), 
+				MANIPULATOR_IDS[i / 2],
+				10.f); // 10 pixel hotspot for arrows
+		mProjectedManipulators.addDataSorted(projManipulator);
+	}
+
+	if (planar_manip_yz_visible)
+	{
+		S32 i = num_arrow_manips;
+		LLVector4 projected_start = mManipulatorVertices[i] * transform;
+		projected_start = projected_start * (1.f / projected_start.mV[VW]);
+
+		LLVector4 projected_end = mManipulatorVertices[i + 1] * transform;
+		projected_end = projected_end * (1.f / projected_end.mV[VW]);
+
+		ManipulatorHandle* projManipulator = 
+			new ManipulatorHandle(LLVector3(projected_start.mV[VX], projected_start.mV[VY], projected_start.mV[VZ]), 
+				LLVector3(projected_end.mV[VX], projected_end.mV[VY], projected_end.mV[VZ]), 
+				MANIPULATOR_IDS[i / 2],
+				20.f); // 20 pixels for planar manipulators
+		mProjectedManipulators.addDataSorted(projManipulator);
+	}
+
+	if (planar_manip_xz_visible)
+	{
+		S32 i = num_arrow_manips + 2;
+		LLVector4 projected_start = mManipulatorVertices[i] * transform;
+		projected_start = projected_start * (1.f / projected_start.mV[VW]);
+
+		LLVector4 projected_end = mManipulatorVertices[i + 1] * transform;
+		projected_end = projected_end * (1.f / projected_end.mV[VW]);
+
+		ManipulatorHandle* projManipulator = 
+			new ManipulatorHandle(LLVector3(projected_start.mV[VX], projected_start.mV[VY], projected_start.mV[VZ]), 
+				LLVector3(projected_end.mV[VX], projected_end.mV[VY], projected_end.mV[VZ]), 
+				MANIPULATOR_IDS[i / 2],
+				20.f); // 20 pixels for planar manipulators
+		mProjectedManipulators.addDataSorted(projManipulator);
+	}
+
+	if (planar_manip_xy_visible)
+	{
+		S32 i = num_arrow_manips + 4;
+		LLVector4 projected_start = mManipulatorVertices[i] * transform;
+		projected_start = projected_start * (1.f / projected_start.mV[VW]);
+
+		LLVector4 projected_end = mManipulatorVertices[i + 1] * transform;
+		projected_end = projected_end * (1.f / projected_end.mV[VW]);
+
+		ManipulatorHandle* projManipulator = 
+			new ManipulatorHandle(LLVector3(projected_start.mV[VX], projected_start.mV[VY], projected_start.mV[VZ]), 
+				LLVector3(projected_end.mV[VX], projected_end.mV[VY], projected_end.mV[VZ]), 
+				MANIPULATOR_IDS[i / 2],
+				20.f); // 20 pixels for planar manipulators
+		mProjectedManipulators.addDataSorted(projManipulator);
+	}
+
+	LLVector2 manip_start_2d;
+	LLVector2 manip_end_2d;
+	LLVector2 manip_dir;
+	F32 half_width = gViewerWindow->getWindowWidth() / 2.f;
+	F32 half_height = gViewerWindow->getWindowHeight() / 2.f;
+	LLVector2 mousePos((F32)x - half_width, (F32)y - half_height);
+	LLVector2 mouse_delta;
+
+	for (ManipulatorHandle* manipulator = mProjectedManipulators.getFirstData();
+		manipulator;
+		manipulator = mProjectedManipulators.getNextData())
+		{
+			manip_start_2d.setVec(manipulator->mStartPosition.mV[VX] * half_width, manipulator->mStartPosition.mV[VY] * half_height);
+			manip_end_2d.setVec(manipulator->mEndPosition.mV[VX] * half_width, manipulator->mEndPosition.mV[VY] * half_height);
+			manip_dir = manip_end_2d - manip_start_2d;
+
+			mouse_delta = mousePos - manip_start_2d;
+
+			F32 manip_length = manip_dir.normVec();
+
+			F32 mouse_pos_manip = mouse_delta * manip_dir;
+			F32 mouse_dist_manip_squared = mouse_delta.magVecSquared() - (mouse_pos_manip * mouse_pos_manip);
+
+			if (mouse_pos_manip > 0.f &&
+				mouse_pos_manip < manip_length &&
+				mouse_dist_manip_squared < manipulator->mHotSpotRadius * manipulator->mHotSpotRadius)
+			{
+				mHighlightedPart = manipulator->mManipID;
+				break;
+			}
+		}
+}
+
+F32 LLManipTranslate::getMinGridScale()
+{
+	F32 scale;
+	switch (mManipPart)
+	{
+	case LL_NO_PART:
+	default:
+		scale = 1.f;
+		break;
+	case LL_X_ARROW:
+		scale = mGridScale.mV[VX];
+		break;
+	case LL_Y_ARROW:
+		scale = mGridScale.mV[VY];
+		break;
+	case LL_Z_ARROW:
+		scale = mGridScale.mV[VZ];
+		break;
+	case LL_YZ_PLANE:
+		scale = llmin(mGridScale.mV[VY], mGridScale.mV[VZ]);
+		break;
+	case LL_XZ_PLANE:
+		scale = llmin(mGridScale.mV[VX], mGridScale.mV[VZ]);
+		break;
+	case LL_XY_PLANE:
+		scale = llmin(mGridScale.mV[VX], mGridScale.mV[VY]);
+		break;
+	}
+
+	return scale;
+}
+
+
+BOOL LLManipTranslate::handleMouseUp(S32 x, S32 y, MASK mask)
+{
+	// first, perform normal processing in case this was a quick-click
+	handleHover(x, y, mask);
+
+	// make sure arrow colors go back to normal
+	mManipPart = LL_NO_PART;
+	gSelectMgr->enableSilhouette(TRUE);
+
+	// Might have missed last update due to UPDATE_DELAY timing.
+	if (mSendUpdateOnMouseUp)
+	{
+		gSelectMgr->sendMultipleUpdate( UPD_POSITION );
+		mSendUpdateOnMouseUp = FALSE;
+	}
+
+//	if (mCopyMadeThisDrag)
+//	{
+//		gSelectMgr->clearGridObjects();
+//	}
+
+	mInSnapRegime = FALSE;
+	gSelectMgr->saveSelectedObjectTransform(SELECT_ACTION_TYPE_PICK);
+	//gAgent.setObjectTracking(gSavedSettings.getBOOL("TrackFocusObject"));
+
+	return LLManip::handleMouseUp(x, y, mask);
+}
+
+
+void LLManipTranslate::render()
+{
+	glMatrixMode(GL_MODELVIEW);
+	glPushMatrix();
+	if (gSelectMgr->getSelectType() == SELECT_TYPE_HUD)
+	{
+		F32 zoom = gAgent.getAvatarObject()->mHUDCurZoom;
+		glScalef(zoom, zoom, zoom);
+	}
+	{
+		LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE);
+		renderGuidelines();
+	}
+	{
+		renderTranslationHandles();
+		renderSnapGuides();
+	}
+	glPopMatrix();
+
+	renderText();
+}
+
+void LLManipTranslate::renderSnapGuides()
+{
+	if (!gSavedSettings.getBOOL("SnapEnabled"))
+	{
+		return;
+	}
+
+	F32 max_subdivisions = sGridMaxSubdivisionLevel;//(F32)gSavedSettings.getS32("GridSubdivision");
+	F32 line_alpha = gSavedSettings.getF32("GridOpacity");
+
+	LLGLSNoTexture gls_no_texture;
+	LLGLDepthTest gls_depth(GL_TRUE);
+	LLGLDisable gls_cull(GL_CULL_FACE);
+	LLVector3 translate_axis;
+
+	if (mManipPart == LL_NO_PART)
+	{
+		return;
+	}
+
+	LLSelectNode *first_node = gSelectMgr->getFirstMoveableNode(TRUE);
+	if (!first_node)
+	{
+		return;
+	}
+	
+	updateGridSettings();
+
+	F32 smallest_grid_unit_scale = getMinGridScale() / max_subdivisions;
+	LLVector3 grid_origin;
+	LLVector3 grid_scale;
+	LLQuaternion grid_rotation;
+
+	gSelectMgr->getGrid(grid_origin, grid_rotation, grid_scale);
+	LLVector3 saved_selection_center = getSavedPivotPoint(); //gSelectMgr->getSavedBBoxOfSelection().getCenterAgent();
+	LLVector3 selection_center = getPivotPoint();
+
+	LLViewerObject *first_object = first_node->getObject();
+
+	//pick appropriate projection plane for snap rulers according to relative camera position
+	if (mManipPart >= LL_X_ARROW && mManipPart <= LL_Z_ARROW)
+	{
+		getManipAxis(first_object, mManipPart, translate_axis);
+
+		LLVector3 at_axis_abs;
+		if (gSelectMgr->getSelectType() == SELECT_TYPE_HUD)
+		{
+			at_axis_abs = LLVector3::x_axis * ~grid_rotation;
+		}
+		else
+		{
+			at_axis_abs = saved_selection_center - gCamera->getOrigin();
+			at_axis_abs.normVec();
+
+			at_axis_abs = at_axis_abs * ~grid_rotation;
+		}
+		at_axis_abs.abs();
+
+		if (at_axis_abs.mV[VX] > at_axis_abs.mV[VY] && at_axis_abs.mV[VX] > at_axis_abs.mV[VZ])
+		{
+			if (mManipPart == LL_Y_ARROW)
+			{
+				mSnapOffsetAxis = LLVector3::z_axis;
+			}
+			else if (mManipPart == LL_Z_ARROW)
+			{
+				mSnapOffsetAxis = LLVector3::y_axis;
+			}
+			else if (at_axis_abs.mV[VY] > at_axis_abs.mV[VZ])
+			{
+				mSnapOffsetAxis = LLVector3::z_axis;
+			}
+			else
+			{
+				mSnapOffsetAxis = LLVector3::y_axis;
+			}
+		}
+		else if (at_axis_abs.mV[VY] > at_axis_abs.mV[VZ])
+		{
+			if (mManipPart == LL_X_ARROW)
+			{
+				mSnapOffsetAxis = LLVector3::z_axis;
+			}
+			else if (mManipPart == LL_Z_ARROW)
+			{
+				mSnapOffsetAxis = LLVector3::x_axis;
+			}
+			else if (at_axis_abs.mV[VX] > at_axis_abs.mV[VZ])
+			{
+				mSnapOffsetAxis = LLVector3::z_axis;
+			}
+			else
+			{
+				mSnapOffsetAxis = LLVector3::x_axis;
+			}
+		}
+		else
+		{
+			if (mManipPart == LL_X_ARROW)
+			{
+				mSnapOffsetAxis = LLVector3::y_axis;
+			}
+			else if (mManipPart == LL_Y_ARROW)
+			{
+				mSnapOffsetAxis = LLVector3::x_axis;
+			}
+			else if (at_axis_abs.mV[VX] > at_axis_abs.mV[VY])
+			{
+				mSnapOffsetAxis = LLVector3::y_axis;
+			}
+			else
+			{
+				mSnapOffsetAxis = LLVector3::x_axis;
+			}
+		}
+
+		mSnapOffsetAxis = mSnapOffsetAxis * grid_rotation;
+
+		F32 guide_size_meters;
+
+		if (gSelectMgr->getSelectType() == SELECT_TYPE_HUD)
+		{
+			guide_size_meters = 1.f / gAgent.getAvatarObject()->mHUDCurZoom;
+			mSnapOffsetMeters = mArrowLengthMeters * 1.5f;
+		}
+		else
+		{
+			LLVector3 cam_to_selection = getPivotPoint() - gCamera->getOrigin();
+			F32 current_range = cam_to_selection.normVec();
+			guide_size_meters = SNAP_GUIDE_SCREEN_SIZE * gViewerWindow->getWindowHeight() * current_range / gCamera->getPixelMeterRatio();
+	
+			F32 fraction_of_fov = mAxisArrowLength / (F32) gCamera->getViewHeightInPixels();
+			F32 apparent_angle = fraction_of_fov * gCamera->getView();  // radians
+			F32 offset_at_camera = tan(apparent_angle) * 1.5f;
+			F32 range = dist_vec(gAgent.getPosAgentFromGlobal(first_node->mSavedPositionGlobal), gCamera->getOrigin());
+			mSnapOffsetMeters = range * offset_at_camera;
+		}
+
+		LLVector3 tick_start;
+		LLVector3 tick_end;
+
+		// how far away from grid origin is the selection along the axis of translation?
+		F32 dist_grid_axis = (selection_center - mGridOrigin) * translate_axis;
+		// find distance to nearest smallest grid unit
+		F32 offset_nearest_grid_unit = fmodf(dist_grid_axis, smallest_grid_unit_scale);
+		// how many smallest grid units are we away from largest grid scale?
+		S32 sub_div_offset = llround(fmod(dist_grid_axis - offset_nearest_grid_unit, getMinGridScale() / sGridMinSubdivisionLevel) / smallest_grid_unit_scale);
+		S32 num_ticks_per_side = llmax(1, llfloor(0.5f * guide_size_meters / smallest_grid_unit_scale));
+
+		LLGLDepthTest gls_depth(GL_FALSE);
+
+		for (S32 pass = 0; pass < 3; pass++)
+		{
+			LLColor4 line_color = setupSnapGuideRenderPass(pass);
+
+			glBegin(GL_LINES);
+			{
+				LLVector3 line_start = selection_center + (mSnapOffsetMeters * mSnapOffsetAxis) + (translate_axis * (guide_size_meters * 0.5f + offset_nearest_grid_unit));
+				LLVector3 line_end = selection_center + (mSnapOffsetMeters * mSnapOffsetAxis) - (translate_axis * (guide_size_meters * 0.5f + offset_nearest_grid_unit));
+				LLVector3 line_mid = (line_start + line_end) * 0.5f;
+
+				glColor4f(line_color.mV[VX], line_color.mV[VY], line_color.mV[VZ], line_color.mV[VW] * 0.2f);
+				glVertex3fv(line_start.mV);
+				glColor4f(line_color.mV[VX], line_color.mV[VY], line_color.mV[VZ], line_color.mV[VW]);
+				glVertex3fv(line_mid.mV);
+				glVertex3fv(line_mid.mV);
+				glColor4f(line_color.mV[VX], line_color.mV[VY], line_color.mV[VZ], line_color.mV[VW] * 0.2f);
+				glVertex3fv(line_end.mV);
+
+				line_start.setVec(selection_center + (mSnapOffsetAxis * -mSnapOffsetMeters) + (translate_axis * guide_size_meters * 0.5f));
+				line_end.setVec(selection_center + (mSnapOffsetAxis * -mSnapOffsetMeters) - (translate_axis * guide_size_meters * 0.5f));
+				line_mid = (line_start + line_end) * 0.5f;
+
+				glColor4f(line_color.mV[VX], line_color.mV[VY], line_color.mV[VZ], line_color.mV[VW] * 0.2f);
+				glVertex3fv(line_start.mV);
+				glColor4f(line_color.mV[VX], line_color.mV[VY], line_color.mV[VZ], line_color.mV[VW]);
+				glVertex3fv(line_mid.mV);
+				glVertex3fv(line_mid.mV);
+				glColor4f(line_color.mV[VX], line_color.mV[VY], line_color.mV[VZ], line_color.mV[VW] * 0.2f);
+				glVertex3fv(line_end.mV);
+
+				for (S32 i = -num_ticks_per_side; i <= num_ticks_per_side; i++)
+				{
+					tick_start = selection_center + (translate_axis * (smallest_grid_unit_scale * (F32)i - offset_nearest_grid_unit));
+
+					F32 cur_subdivisions = llclamp(getSubdivisionLevel(tick_start, translate_axis, getMinGridScale()), sGridMinSubdivisionLevel, sGridMaxSubdivisionLevel);
+
+					if (fmodf((F32)(i + sub_div_offset), (max_subdivisions / cur_subdivisions)) != 0.f)
+					{
+						continue;
+					}
+
+					// add in off-axis offset
+					tick_start += (mSnapOffsetAxis * mSnapOffsetMeters);
+
+					BOOL is_sub_tick = FALSE;
+					F32 tick_scale = 1.f;
+					for (F32 division_level = max_subdivisions; division_level >= sGridMinSubdivisionLevel; division_level /= 2.f)
+					{
+						if (fmodf((F32)(i + sub_div_offset), division_level) == 0.f)
+						{
+							break;
+						}
+						tick_scale *= 0.7f;
+						is_sub_tick = TRUE;
+					}
+
+// 					S32 num_ticks_to_fade = is_sub_tick ? num_ticks_per_side / 2 : num_ticks_per_side;
+// 					F32 alpha = line_alpha * (1.f - (0.8f *  ((F32)llabs(i) / (F32)num_ticks_to_fade)));
+
+					tick_end = tick_start + (mSnapOffsetAxis * mSnapOffsetMeters * tick_scale);
+
+					glColor4f(line_color.mV[VX], line_color.mV[VY], line_color.mV[VZ], line_color.mV[VW]);
+					glVertex3fv(tick_start.mV);
+					glVertex3fv(tick_end.mV);
+
+					tick_start = selection_center + (mSnapOffsetAxis * -mSnapOffsetMeters) +
+						(translate_axis * (getMinGridScale() / (F32)(max_subdivisions) * (F32)i - offset_nearest_grid_unit));
+					tick_end = tick_start - (mSnapOffsetAxis * mSnapOffsetMeters * tick_scale);
+
+					glVertex3fv(tick_start.mV);
+					glVertex3fv(tick_end.mV);
+				}
+			}
+			glEnd();
+
+			if (mInSnapRegime)
+			{
+				LLVector3 line_start = selection_center - mSnapOffsetAxis * mSnapOffsetMeters;
+				LLVector3 line_end = selection_center + mSnapOffsetAxis * mSnapOffsetMeters;
+
+				glBegin(GL_LINES);
+				{
+					glColor4f(line_color.mV[VX], line_color.mV[VY], line_color.mV[VZ], line_color.mV[VW]);
+
+					glVertex3fv(line_start.mV);
+					glVertex3fv(line_end.mV);
+				}
+				glEnd();
+
+				// draw snap guide arrow
+				glBegin(GL_TRIANGLES);
+				{
+					glColor4f(line_color.mV[VX], line_color.mV[VY], line_color.mV[VZ], line_color.mV[VW]);
+
+					LLVector3 arrow_dir;
+					LLVector3 arrow_span = translate_axis;
+
+					arrow_dir = -mSnapOffsetAxis;
+					glVertex3fv((line_start + arrow_dir * mConeSize * SNAP_ARROW_SCALE).mV);
+					glVertex3fv((line_start + arrow_span * mConeSize * SNAP_ARROW_SCALE).mV);
+					glVertex3fv((line_start - arrow_span * mConeSize * SNAP_ARROW_SCALE).mV);
+
+					arrow_dir = mSnapOffsetAxis;
+					glVertex3fv((line_end + arrow_dir * mConeSize * SNAP_ARROW_SCALE).mV);
+					glVertex3fv((line_end + arrow_span * mConeSize * SNAP_ARROW_SCALE).mV);
+					glVertex3fv((line_end - arrow_span * mConeSize * SNAP_ARROW_SCALE).mV);
+				}
+				glEnd();
+			}
+		}
+
+		sub_div_offset = llround(fmod(dist_grid_axis - offset_nearest_grid_unit, getMinGridScale() * 32.f) / smallest_grid_unit_scale);
+
+		LLVector2 screen_translate_axis(llabs(translate_axis * gCamera->getLeftAxis()), llabs(translate_axis * gCamera->getUpAxis()));
+		screen_translate_axis.normVec();
+
+		S32 tick_label_spacing = llround(screen_translate_axis * sTickLabelSpacing);
+        
+		// render tickmark values
+		for (S32 i = -num_ticks_per_side; i <= num_ticks_per_side; i++)
+		{
+			LLVector3 tick_pos = selection_center + (translate_axis * ((smallest_grid_unit_scale * (F32)i) - offset_nearest_grid_unit));
+			F32 alpha = line_alpha * (1.f - (0.5f *  ((F32)llabs(i) / (F32)num_ticks_per_side)));
+
+			F32 tick_scale = 1.f;
+			for (F32 division_level = max_subdivisions; division_level >= sGridMinSubdivisionLevel; division_level /= 2.f)
+			{
+				if (fmodf((F32)(i + sub_div_offset), division_level) == 0.f)
+				{
+					break;
+				}
+				tick_scale *= 0.7f;
+			}
+
+			if (fmodf((F32)(i + sub_div_offset), (max_subdivisions / llmin(sGridMaxSubdivisionLevel, getSubdivisionLevel(tick_pos, translate_axis, getMinGridScale(), tick_label_spacing)))) == 0.f)
+			{
+				F32 snap_offset_meters;
+
+				if (mSnapOffsetAxis * gCamera->getUpAxis() > 0.f)
+				{
+					snap_offset_meters = mSnapOffsetMeters;			
+				}
+				else
+				{
+					snap_offset_meters = -mSnapOffsetMeters;
+				}
+				LLVector3 text_origin = selection_center + 
+						(translate_axis * ((smallest_grid_unit_scale * (F32)i) - offset_nearest_grid_unit)) + 
+							(mSnapOffsetAxis * snap_offset_meters * (1.f + tick_scale));
+				
+				LLVector3 tick_offset = (tick_pos - mGridOrigin) * ~mGridRotation;
+				F32 offset_val = 0.5f * tick_offset.mV[ARROW_TO_AXIS[mManipPart]] / getMinGridScale();
+				EGridMode grid_mode = gSelectMgr->getGridMode();
+				F32 text_highlight = 0.8f;
+				if(i - llround(offset_nearest_grid_unit / smallest_grid_unit_scale) == 0 && mInSnapRegime)
+				{
+					text_highlight = 1.f;
+				}
+				
+				if (grid_mode == GRID_MODE_WORLD)
+				{
+					// rescale units to meters from multiple of grid scale
+					offset_val *= 2.f * grid_scale[ARROW_TO_AXIS[mManipPart]];
+					renderTickValue(text_origin, offset_val, "m", LLColor4(text_highlight, text_highlight, text_highlight, alpha));
+				}
+				else
+				{
+					renderTickValue(text_origin, offset_val, "x", LLColor4(text_highlight, text_highlight, text_highlight, alpha));
+				}
+			}
+		}
+		if (gSelectMgr->getSelectType() != SELECT_TYPE_HUD)
+		{
+			// render helpful text
+			if (mHelpTextTimer.getElapsedTimeF32() < sHelpTextVisibleTime + sHelpTextFadeTime && sNumTimesHelpTextShown < sMaxTimesShowHelpText)
+			{
+				F32 snap_offset_meters_up;
+				if (mSnapOffsetAxis * gCamera->getUpAxis() > 0.f)
+				{
+					snap_offset_meters_up = mSnapOffsetMeters;			
+				}
+				else
+				{
+					snap_offset_meters_up = -mSnapOffsetMeters;
+				}
+
+				LLVector3 selection_center_start = getSavedPivotPoint();//gSelectMgr->getSavedBBoxOfSelection().getCenterAgent();
+
+				LLVector3 help_text_pos = selection_center_start + (snap_offset_meters_up * 3.f * mSnapOffsetAxis);
+				const LLFontGL* big_fontp = LLFontGL::sSansSerif;
+
+				LLGLSTexture gls_texture;
+				std::string help_text = "Move mouse cursor over ruler to snap";
+				LLColor4 help_text_color = LLColor4::white;
+				help_text_color.mV[VALPHA] = clamp_rescale(mHelpTextTimer.getElapsedTimeF32(), sHelpTextVisibleTime, sHelpTextVisibleTime + sHelpTextFadeTime, line_alpha, 0.f);
+				hud_render_utf8text(help_text, help_text_pos, *big_fontp, LLFontGL::NORMAL, -0.5f * big_fontp->getWidthF32(help_text), 3.f, help_text_color, gSelectMgr->getSelectType() == SELECT_TYPE_HUD);
+				help_text = "to snap to grid";
+				help_text_pos -= gCamera->getUpAxis() * mSnapOffsetMeters * 0.2f;
+				hud_render_utf8text(help_text, help_text_pos, *big_fontp, LLFontGL::NORMAL, -0.5f * big_fontp->getWidthF32(help_text), 3.f, help_text_color, gSelectMgr->getSelectType() == SELECT_TYPE_HUD);
+			}
+		}
+	}
+	else
+	{
+		// render gridlines for planar snapping
+
+		F32 u = 0, v = 0;
+		glPushMatrix();
+
+		F32 x,y,z,angle_radians;
+		grid_rotation.getAngleAxis(&angle_radians, &x, &y, &z);
+		glTranslatef(selection_center.mV[VX], selection_center.mV[VY], selection_center.mV[VZ]);
+		glRotatef(angle_radians * RAD_TO_DEG, x, y, z);
+
+		LLVector3 grid_center = selection_center - grid_origin;
+		grid_center *= ~grid_rotation;
+		
+		F32 usc = 1;
+		F32 vsc = 1;
+
+		switch (mManipPart)
+		{
+		case LL_YZ_PLANE:
+			u = grid_center.mV[VY];
+			v = grid_center.mV[VZ];
+			usc = grid_scale.mV[VY];
+			vsc = grid_scale.mV[VZ];
+			break;
+		case LL_XZ_PLANE:
+			u = grid_center.mV[VX];
+			v = grid_center.mV[VZ];
+			usc = grid_scale.mV[VX];
+			vsc = grid_scale.mV[VZ];
+			break;
+		case LL_XY_PLANE:
+			u = grid_center.mV[VX];
+			v = grid_center.mV[VY];
+			usc = grid_scale.mV[VX];
+			vsc = grid_scale.mV[VY];
+			break;
+		default:
+			break;
+		}
+
+		F32 sz = mGridSizeMeters;
+		F32 tiles = sz;
+		glMatrixMode(GL_TEXTURE);
+		glPushMatrix();
+		usc = 1.0f/usc;
+		vsc = 1.0f/vsc;
+		
+		while (usc > vsc*4.0f)
+		{
+			usc *= 0.5f;
+		}
+		while (vsc > usc * 4.0f)
+		{
+			vsc *= 0.5f;
+		}
+
+		glScalef(usc, vsc, 1.0f);
+		glTranslatef(u, v, 0);
+		
+		float a = line_alpha;
+
+		LLColor4 col = gColors.getColor("SilhouetteChildColor");
+		{
+			//draw grid behind objects
+			LLGLSTexture tex2d;
+			LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE);
+
+			{
+				LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE, GL_GREATER);
+				glBindTexture(GL_TEXTURE_2D, sGridTex);
+				glBlendFunc(GL_ZERO, GL_ONE_MINUS_SRC_ALPHA);
+				renderGrid(u,v,tiles,0.9f, 0.9f, 0.9f,a*0.15f);
+				glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+			}
+			
+			{
+				LLGLDisable alpha_test(GL_ALPHA_TEST);
+				//draw black overlay
+				glBindTexture(GL_TEXTURE_2D, 0);
+				renderGrid(u,v,tiles,0.0f, 0.0f, 0.0f,a*0.16f);
+
+				//draw grid top
+				glBindTexture(GL_TEXTURE_2D, sGridTex);
+				renderGrid(u,v,tiles,1,1,1,a);
+
+				glPopMatrix();
+				glMatrixMode(GL_MODELVIEW);
+				glPopMatrix();
+
+				{
+					LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE);
+					renderGuidelines();
+				}
+
+				{
+					LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE, GL_GREATER);
+					LLGLEnable stipple(GL_LINE_STIPPLE);
+					glLineStipple(1, 0x3333);
+		
+					switch (mManipPart)
+					{
+					  case LL_YZ_PLANE:
+						renderGuidelines(FALSE, TRUE, TRUE);
+						break;
+					  case LL_XZ_PLANE:
+						renderGuidelines(TRUE, FALSE, TRUE);
+						break;
+					  case LL_XY_PLANE:
+						renderGuidelines(TRUE, TRUE, FALSE);
+						break;
+					  default:
+						break;
+					}
+				}
+			}
+		}
+	}
+}
+
+void LLManipTranslate::renderGrid(F32 x, F32 y, F32 size, F32 r, F32 g, F32 b, F32 a)
+{
+	F32 d = size*0.5f;
+
+	for (F32 xx = -size-d; xx < size+d; xx += d)
+	{
+		glBegin(GL_TRIANGLE_STRIP);
+		for (F32 yy = -size-d; yy < size+d; yy += d)
+		{
+			float dx, dy, da;
+
+			dx = xx; dy = yy;
+			da = sqrtf(llmax(0.0f, 1.0f-sqrtf(dx*dx+dy*dy)/size))*a;
+			glTexCoord2f(dx, dy);
+			renderGridVert(dx,dy,r,g,b,da);
+
+			dx = xx+d; dy = yy;
+			da = sqrtf(llmax(0.0f, 1.0f-sqrtf(dx*dx+dy*dy)/size))*a;
+			glTexCoord2f(dx, dy);
+			renderGridVert(dx,dy,r,g,b,da);
+			
+			dx = xx; dy = yy+d;
+			da = sqrtf(llmax(0.0f, 1.0f-sqrtf(dx*dx+dy*dy)/size))*a;
+			glTexCoord2f(dx, dy);
+			renderGridVert(dx,dy,r,g,b,da);
+
+			dx = xx+d; dy = yy+d;
+			da = sqrtf(llmax(0.0f, 1.0f-sqrtf(dx*dx+dy*dy)/size))*a;
+			glTexCoord2f(dx, dy);
+			renderGridVert(dx,dy,r,g,b,da);
+		}
+		glEnd();
+	}
+
+	
+}
+
+
+void LLManipTranslate::renderText()
+{
+	if (gSelectMgr->getRootObjectCount() && !gSelectMgr->selectionIsAttachment())
+	{
+		LLVector3 pos = getPivotPoint();
+		renderXYZ(pos);
+	}
+	else
+	{
+		LLViewerObject* objectp = gSelectMgr->getFirstRootObject();
+		if(!objectp)
+		{
+			objectp = gSelectMgr->getFirstObject();
+		}
+
+		if (objectp)
+		{
+			renderXYZ(objectp->getPositionEdit());
+		}
+	}
+}
+
+void LLManipTranslate::renderTranslationHandles()
+{
+	LLVector3 grid_origin;
+	LLVector3 grid_scale;
+	LLQuaternion grid_rotation;
+	LLGLDepthTest gls_depth(GL_FALSE);
+	
+	gSelectMgr->getGrid(grid_origin, grid_rotation, grid_scale);
+	LLVector3 at_axis;
+	if (gSelectMgr->getSelectType() == SELECT_TYPE_HUD)
+	{
+		at_axis = LLVector3::x_axis * ~grid_rotation;
+	}
+	else
+	{
+		at_axis = gCamera->getAtAxis() * ~grid_rotation;
+	}
+
+	if (at_axis.mV[VX] > 0.f)
+	{
+		mPlaneManipPositions.mV[VX] = 1.f;
+	}
+	else
+	{
+		mPlaneManipPositions.mV[VX] = -1.f;
+	}
+
+	if (at_axis.mV[VY] > 0.f)
+	{
+		mPlaneManipPositions.mV[VY] = 1.f;
+	}
+	else
+	{
+		mPlaneManipPositions.mV[VY] = -1.f;
+	}
+
+	if (at_axis.mV[VZ] > 0.f)
+	{
+		mPlaneManipPositions.mV[VZ] = 1.f;
+	}
+	else
+	{
+		mPlaneManipPositions.mV[VZ] = -1.f;
+	}
+
+	LLViewerObject *first_object = gSelectMgr->getFirstMoveableObject(TRUE);
+	if (!first_object) return;
+
+	LLVector3 selection_center = getPivotPoint();
+
+	// Drag handles 	
+	if (gSelectMgr->getSelectType() == SELECT_TYPE_HUD)
+	{
+		mArrowLengthMeters = mAxisArrowLength / gViewerWindow->getWindowHeight();
+		mArrowLengthMeters /= gAgent.getAvatarObject()->mHUDCurZoom;
+	}
+	else
+	{
+		LLVector3 camera_pos_agent = gAgent.getCameraPositionAgent();
+		F32 range = dist_vec(camera_pos_agent, selection_center);
+		F32 range_from_agent = dist_vec(gAgent.getPositionAgent(), selection_center);
+		
+		// Don't draw handles if you're too far away
+		if (gSavedSettings.getBOOL("LimitSelectDistance"))
+		{
+			if (range_from_agent > gSavedSettings.getF32("MaxSelectDistance"))
+			{
+				return;
+			}
+		}
+
+		if (range > 0.001f)
+		{
+			// range != zero
+			F32 fraction_of_fov = mAxisArrowLength / (F32) gCamera->getViewHeightInPixels();
+			F32 apparent_angle = fraction_of_fov * gCamera->getView();  // radians
+			mArrowLengthMeters = range * tan(apparent_angle);
+		}
+		else
+		{
+			// range == zero
+			mArrowLengthMeters = 1.0f;
+		}
+	}
+
+	mPlaneManipOffsetMeters = mArrowLengthMeters * 1.8f;
+	mGridSizeMeters = gSavedSettings.getF32("GridDrawSize");
+	mConeSize = mArrowLengthMeters / 4.f;
+
+	glMatrixMode(GL_MODELVIEW);
+	glPushMatrix();
+	{
+		glTranslatef(selection_center.mV[VX], selection_center.mV[VY], selection_center.mV[VZ]);
+
+		F32 angle_radians, x, y, z;
+		grid_rotation.getAngleAxis(&angle_radians, &x, &y, &z);
+
+		glRotatef(angle_radians * RAD_TO_DEG, x, y, z);
+
+		LLQuaternion invRotation = grid_rotation;
+		invRotation.conjQuat();
+
+		LLVector3 relative_camera_dir;
+		
+		if (gSelectMgr->getSelectType() == SELECT_TYPE_HUD)
+		{
+			relative_camera_dir = LLVector3::x_axis * invRotation;
+		}
+		else
+		{
+			relative_camera_dir = (selection_center - gCamera->getOrigin()) * invRotation;
+		}
+		relative_camera_dir.normVec();
+
+		{
+			LLGLSNoTexture gls_ui_no_texture;
+			LLGLDisable cull_face(GL_CULL_FACE);
+
+			LLColor4 color1;
+			LLColor4 color2;
+
+			// update manipulator sizes
+			for (S32 index = 0; index < 3; index++)
+			{
+				if (index == mManipPart - LL_X_ARROW || index == mHighlightedPart - LL_X_ARROW)
+				{
+					mArrowScales.mV[index] = lerp(mArrowScales.mV[index], SELECTED_ARROW_SCALE, LLCriticalDamp::getInterpolant(MANIPULATOR_SCALE_HALF_LIFE ));
+					mPlaneScales.mV[index] = lerp(mPlaneScales.mV[index], 1.f, LLCriticalDamp::getInterpolant(MANIPULATOR_SCALE_HALF_LIFE ));
+				}
+				else if (index == mManipPart - LL_YZ_PLANE || index == mHighlightedPart - LL_YZ_PLANE)
+				{
+					mArrowScales.mV[index] = lerp(mArrowScales.mV[index], 1.f, LLCriticalDamp::getInterpolant(MANIPULATOR_SCALE_HALF_LIFE ));
+					mPlaneScales.mV[index] = lerp(mPlaneScales.mV[index], SELECTED_ARROW_SCALE, LLCriticalDamp::getInterpolant(MANIPULATOR_SCALE_HALF_LIFE ));
+				}
+				else
+				{
+					mArrowScales.mV[index] = lerp(mArrowScales.mV[index], 1.f, LLCriticalDamp::getInterpolant(MANIPULATOR_SCALE_HALF_LIFE ));
+					mPlaneScales.mV[index] = lerp(mPlaneScales.mV[index], 1.f, LLCriticalDamp::getInterpolant(MANIPULATOR_SCALE_HALF_LIFE ));
+				}
+			}
+
+			if ((mManipPart == LL_NO_PART || mManipPart == LL_YZ_PLANE) && llabs(relative_camera_dir.mV[VX]) > MIN_PLANE_MANIP_DOT_PRODUCT)
+			{
+				// render YZ plane manipulator
+				glPushMatrix();
+				glScalef(mPlaneManipPositions.mV[VX], mPlaneManipPositions.mV[VY], mPlaneManipPositions.mV[VZ]);
+				glTranslatef(0.f, mPlaneManipOffsetMeters, mPlaneManipOffsetMeters);
+				glScalef(mPlaneScales.mV[VX], mPlaneScales.mV[VX], mPlaneScales.mV[VX]);
+				if (mHighlightedPart == LL_YZ_PLANE)
+				{
+					color1.setVec(0.f, 1.f, 0.f, 1.f);
+					color2.setVec(0.f, 0.f, 1.f, 1.f);
+				}
+				else
+				{
+					color1.setVec(0.f, 1.f, 0.f, 0.6f);
+					color2.setVec(0.f, 0.f, 1.f, 0.6f);
+				}
+				glBegin(GL_TRIANGLES);
+				{
+					glColor4fv(color1.mV);
+					glVertex3f(0.f, mPlaneManipOffsetMeters * (-PLANE_TICK_SIZE * 0.25f), mPlaneManipOffsetMeters * (-PLANE_TICK_SIZE * 0.25f));
+					glVertex3f(0.f, mPlaneManipOffsetMeters * (PLANE_TICK_SIZE * 0.25f), mPlaneManipOffsetMeters * (-PLANE_TICK_SIZE * 0.75f));
+					glVertex3f(0.f, mPlaneManipOffsetMeters * (PLANE_TICK_SIZE * 0.25f), mPlaneManipOffsetMeters * (PLANE_TICK_SIZE * 0.25f));
+
+					glColor4fv(color2.mV);
+					glVertex3f(0.f, mPlaneManipOffsetMeters * (PLANE_TICK_SIZE * 0.25f), mPlaneManipOffsetMeters * (PLANE_TICK_SIZE * 0.25f));
+					glVertex3f(0.f, mPlaneManipOffsetMeters * (-PLANE_TICK_SIZE * 0.75f), mPlaneManipOffsetMeters * (PLANE_TICK_SIZE * 0.25f));
+					glVertex3f(0.f, mPlaneManipOffsetMeters * (-PLANE_TICK_SIZE * 0.25f), mPlaneManipOffsetMeters * (-PLANE_TICK_SIZE * 0.25f));
+				}
+				glEnd();
+
+				LLUI::setLineWidth(3.0f);
+				glBegin(GL_LINES);
+				{
+					glColor4f(0.f, 0.f, 0.f, 0.3f);
+					glVertex3f(0.f, mPlaneManipOffsetMeters * -PLANE_TICK_SIZE * 0.25f,  mPlaneManipOffsetMeters * -PLANE_TICK_SIZE * 0.25f);
+					glVertex3f(0.f, mPlaneManipOffsetMeters * PLANE_TICK_SIZE  * 0.25f,  mPlaneManipOffsetMeters * -PLANE_TICK_SIZE * 0.25f);
+					glVertex3f(0.f, mPlaneManipOffsetMeters * PLANE_TICK_SIZE  * 0.25f,  mPlaneManipOffsetMeters * -PLANE_TICK_SIZE * 0.25f);
+					glVertex3f(0.f, mPlaneManipOffsetMeters * PLANE_TICK_SIZE  * 0.1f,   mPlaneManipOffsetMeters * -PLANE_TICK_SIZE * 0.1f);
+					glVertex3f(0.f, mPlaneManipOffsetMeters * PLANE_TICK_SIZE  * 0.25f,  mPlaneManipOffsetMeters * -PLANE_TICK_SIZE * 0.25f);
+					glVertex3f(0.f, mPlaneManipOffsetMeters * PLANE_TICK_SIZE  * 0.1f,   mPlaneManipOffsetMeters * -PLANE_TICK_SIZE * 0.4f);
+
+					glVertex3f(0.f, mPlaneManipOffsetMeters * -PLANE_TICK_SIZE * 0.25f, mPlaneManipOffsetMeters * -PLANE_TICK_SIZE * 0.25f);
+					glVertex3f(0.f, mPlaneManipOffsetMeters * -PLANE_TICK_SIZE * 0.25f, mPlaneManipOffsetMeters * PLANE_TICK_SIZE * 0.25f);
+					glVertex3f(0.f, mPlaneManipOffsetMeters * -PLANE_TICK_SIZE * 0.25f, mPlaneManipOffsetMeters * PLANE_TICK_SIZE * 0.25f);
+					glVertex3f(0.f, mPlaneManipOffsetMeters * -PLANE_TICK_SIZE * 0.1f,  mPlaneManipOffsetMeters * PLANE_TICK_SIZE * 0.1f);
+					glVertex3f(0.f, mPlaneManipOffsetMeters * -PLANE_TICK_SIZE * 0.25f, mPlaneManipOffsetMeters * PLANE_TICK_SIZE * 0.25f);
+					glVertex3f(0.f, mPlaneManipOffsetMeters * -PLANE_TICK_SIZE * 0.4f,  mPlaneManipOffsetMeters * PLANE_TICK_SIZE * 0.1f);
+				}
+				glEnd();
+				LLUI::setLineWidth(1.0f);
+				glPopMatrix();
+			}
+
+			if ((mManipPart == LL_NO_PART || mManipPart == LL_XZ_PLANE) && llabs(relative_camera_dir.mV[VY]) > MIN_PLANE_MANIP_DOT_PRODUCT)
+			{
+				// render XZ plane manipulator
+				glPushMatrix();
+				glScalef(mPlaneManipPositions.mV[VX], mPlaneManipPositions.mV[VY], mPlaneManipPositions.mV[VZ]);
+				glTranslatef(mPlaneManipOffsetMeters, 0.f, mPlaneManipOffsetMeters);
+				glScalef(mPlaneScales.mV[VY], mPlaneScales.mV[VY], mPlaneScales.mV[VY]);
+				if (mHighlightedPart == LL_XZ_PLANE)
+				{
+					color1.setVec(0.f, 0.f, 1.f, 1.f);
+					color2.setVec(1.f, 0.f, 0.f, 1.f);
+				}
+				else
+				{
+					color1.setVec(0.f, 0.f, 1.f, 0.6f);
+					color2.setVec(1.f, 0.f, 0.f, 0.6f);
+				}
+
+				glBegin(GL_TRIANGLES);
+				{
+					glColor4fv(color1.mV);
+					glVertex3f(mPlaneManipOffsetMeters * (PLANE_TICK_SIZE * 0.25f), 0.f, mPlaneManipOffsetMeters * (PLANE_TICK_SIZE * 0.25f));
+					glVertex3f(mPlaneManipOffsetMeters * (-PLANE_TICK_SIZE * 0.75f), 0.f, mPlaneManipOffsetMeters * (PLANE_TICK_SIZE * 0.25f));
+					glVertex3f(mPlaneManipOffsetMeters * (-PLANE_TICK_SIZE * 0.25f), 0.f, mPlaneManipOffsetMeters * (-PLANE_TICK_SIZE * 0.25f));
+
+					glColor4fv(color2.mV);
+					glVertex3f(mPlaneManipOffsetMeters * (-PLANE_TICK_SIZE * 0.25f), 0.f, mPlaneManipOffsetMeters * (-PLANE_TICK_SIZE * 0.25f));
+					glVertex3f(mPlaneManipOffsetMeters * (PLANE_TICK_SIZE * 0.25f),	0.f, mPlaneManipOffsetMeters * (-PLANE_TICK_SIZE * 0.75f));
+					glVertex3f(mPlaneManipOffsetMeters * (PLANE_TICK_SIZE * 0.25f),	0.f, mPlaneManipOffsetMeters * (PLANE_TICK_SIZE * 0.25f));
+				}
+				glEnd();
+
+				LLUI::setLineWidth(3.0f);
+				glBegin(GL_LINES);
+				{
+					glColor4f(0.f, 0.f, 0.f, 0.3f);
+					glVertex3f(mPlaneManipOffsetMeters * -PLANE_TICK_SIZE * 0.25f,  0.f, mPlaneManipOffsetMeters * -PLANE_TICK_SIZE * 0.25f);
+					glVertex3f(mPlaneManipOffsetMeters * PLANE_TICK_SIZE  * 0.25f,  0.f, mPlaneManipOffsetMeters * -PLANE_TICK_SIZE * 0.25f);
+					glVertex3f(mPlaneManipOffsetMeters * PLANE_TICK_SIZE  * 0.25f,  0.f, mPlaneManipOffsetMeters * -PLANE_TICK_SIZE * 0.25f);
+					glVertex3f(mPlaneManipOffsetMeters * PLANE_TICK_SIZE  * 0.1f,   0.f, mPlaneManipOffsetMeters * -PLANE_TICK_SIZE * 0.1f);
+					glVertex3f(mPlaneManipOffsetMeters * PLANE_TICK_SIZE  * 0.25f,  0.f, mPlaneManipOffsetMeters * -PLANE_TICK_SIZE * 0.25f);
+					glVertex3f(mPlaneManipOffsetMeters * PLANE_TICK_SIZE  * 0.1f,   0.f, mPlaneManipOffsetMeters * -PLANE_TICK_SIZE * 0.4f);
+																				
+					glVertex3f(mPlaneManipOffsetMeters * -PLANE_TICK_SIZE * 0.25f,  0.f, mPlaneManipOffsetMeters * -PLANE_TICK_SIZE * 0.25f);
+					glVertex3f(mPlaneManipOffsetMeters * -PLANE_TICK_SIZE * 0.25f,  0.f, mPlaneManipOffsetMeters * PLANE_TICK_SIZE * 0.25f);
+					glVertex3f(mPlaneManipOffsetMeters * -PLANE_TICK_SIZE * 0.25f,  0.f, mPlaneManipOffsetMeters * PLANE_TICK_SIZE * 0.25f);
+					glVertex3f(mPlaneManipOffsetMeters * -PLANE_TICK_SIZE * 0.1f,   0.f, mPlaneManipOffsetMeters * PLANE_TICK_SIZE * 0.1f);
+					glVertex3f(mPlaneManipOffsetMeters * -PLANE_TICK_SIZE * 0.25f,  0.f, mPlaneManipOffsetMeters * PLANE_TICK_SIZE * 0.25f);
+					glVertex3f(mPlaneManipOffsetMeters * -PLANE_TICK_SIZE * 0.4f,   0.f, mPlaneManipOffsetMeters * PLANE_TICK_SIZE * 0.1f);
+				}
+				glEnd();
+				LLUI::setLineWidth(1.0f);
+
+				glPopMatrix();
+			}
+
+			if ((mManipPart == LL_NO_PART || mManipPart == LL_XY_PLANE) && llabs(relative_camera_dir.mV[VZ]) > MIN_PLANE_MANIP_DOT_PRODUCT)
+			{
+				// render XY plane manipulator
+				glPushMatrix();
+				glScalef(mPlaneManipPositions.mV[VX], mPlaneManipPositions.mV[VY], mPlaneManipPositions.mV[VZ]);
+				
+/*				 			  Y
+				 			  ^
+				 			  v1
+				 			  |  \ 
+				 			  |<- v0
+				 			  |  /| \ 
+				 			  v2__v__v3 > X
+*/
+					LLVector3 v0,v1,v2,v3;
+#if 0
+					// This should theoretically work but looks off; could be tuned later -SJB
+					glTranslatef(-mPlaneManipOffsetMeters, -mPlaneManipOffsetMeters, 0.f);
+					v0 = LLVector3(mPlaneManipOffsetMeters * ( PLANE_TICK_SIZE * 0.25f), mPlaneManipOffsetMeters * ( PLANE_TICK_SIZE * 0.25f), 0.f);
+					v1 = LLVector3(mPlaneManipOffsetMeters * (-PLANE_TICK_SIZE * 0.25f), mPlaneManipOffsetMeters * ( PLANE_TICK_SIZE * 0.75f), 0.f);
+					v2 = LLVector3(mPlaneManipOffsetMeters * (-PLANE_TICK_SIZE * 0.25f), mPlaneManipOffsetMeters * (-PLANE_TICK_SIZE * 0.25f), 0.f);
+					v3 = LLVector3(mPlaneManipOffsetMeters * ( PLANE_TICK_SIZE * 0.75f), mPlaneManipOffsetMeters * (-PLANE_TICK_SIZE * 0.25f), 0.f);
+#else
+					glTranslatef(mPlaneManipOffsetMeters, mPlaneManipOffsetMeters, 0.f);
+					v0 = LLVector3(mPlaneManipOffsetMeters * (-PLANE_TICK_SIZE * 0.25f), mPlaneManipOffsetMeters * (-PLANE_TICK_SIZE * 0.25f), 0.f);
+					v1 = LLVector3(mPlaneManipOffsetMeters * ( PLANE_TICK_SIZE * 0.25f), mPlaneManipOffsetMeters * (-PLANE_TICK_SIZE * 0.75f), 0.f);
+					v2 = LLVector3(mPlaneManipOffsetMeters * ( PLANE_TICK_SIZE * 0.25f), mPlaneManipOffsetMeters * ( PLANE_TICK_SIZE * 0.25f), 0.f);
+					v3 = LLVector3(mPlaneManipOffsetMeters * (-PLANE_TICK_SIZE * 0.75f), mPlaneManipOffsetMeters * ( PLANE_TICK_SIZE * 0.25f), 0.f);
+#endif
+					glScalef(mPlaneScales.mV[VZ], mPlaneScales.mV[VZ], mPlaneScales.mV[VZ]);
+					if (mHighlightedPart == LL_XY_PLANE)
+					{
+						color1.setVec(1.f, 0.f, 0.f, 1.f);
+						color2.setVec(0.f, 1.f, 0.f, 1.f);
+					}
+					else
+					{
+						color1.setVec(0.8f, 0.f, 0.f, 0.6f);
+						color2.setVec(0.f, 0.8f, 0.f, 0.6f);
+					}
+				
+					glBegin(GL_TRIANGLES);
+					{
+						glColor4fv(color1.mV);
+						glVertex3fv(v0.mV);
+						glVertex3fv(v1.mV);
+						glVertex3fv(v2.mV);
+
+						glColor4fv(color2.mV);
+						glVertex3fv(v2.mV);
+						glVertex3fv(v3.mV);
+						glVertex3fv(v0.mV);
+					}
+					glEnd();
+
+					LLUI::setLineWidth(3.0f);
+					glBegin(GL_LINES);
+					{
+						glColor4f(0.f, 0.f, 0.f, 0.3f);
+						LLVector3 v12 = (v1 + v2) * .5f;
+						glVertex3fv(v0.mV);
+						glVertex3fv(v12.mV);
+						glVertex3fv(v12.mV);
+						glVertex3fv((v12 + (v0-v12)*.3f + (v2-v12)*.3f).mV);
+						glVertex3fv(v12.mV);
+						glVertex3fv((v12 + (v0-v12)*.3f + (v1-v12)*.3f).mV);
+
+						LLVector3 v23 = (v2 + v3) * .5f;
+						glVertex3fv(v0.mV);
+						glVertex3fv(v23.mV);
+						glVertex3fv(v23.mV);
+						glVertex3fv((v23 + (v0-v23)*.3f + (v3-v23)*.3f).mV);
+						glVertex3fv(v23.mV);
+						glVertex3fv((v23 + (v0-v23)*.3f + (v2-v23)*.3f).mV);
+					}
+					glEnd();
+					LLUI::setLineWidth(1.0f);
+
+				glPopMatrix();
+			}
+		}
+		{
+			LLGLSNoTexture gls_ui_no_texture;
+
+			// Since we draw handles with depth testing off, we need to draw them in the 
+			// proper depth order.
+
+			// Copied from LLDrawable::updateGeometry
+			LLVector3 pos_agent     = first_object->getPositionAgent();
+			LLVector3 camera_agent	= gAgent.getCameraPositionAgent();
+			LLVector3 headPos		= pos_agent - camera_agent;
+
+			LLVector3 orientWRTHead    = headPos * invRotation;
+
+			// Find nearest vertex
+			U32 nearest = (orientWRTHead.mV[0] < 0.0f ? 1 : 0) + 
+				(orientWRTHead.mV[1] < 0.0f ? 2 : 0) + 
+				(orientWRTHead.mV[2] < 0.0f ? 4 : 0);
+
+			// opposite faces on Linden cubes:
+			// 0 & 5
+			// 1 & 3
+			// 2 & 4
+
+			// Table of order to draw faces, based on nearest vertex
+			static U32 face_list[8][NUM_AXES*2] = { 
+				{ 2,0,1, 4,5,3 }, // v6  F201 F453
+				{ 2,0,3, 4,5,1 }, // v7  F203 F451
+				{ 4,0,1, 2,5,3 }, // v5  F401 F253
+				{ 4,0,3, 2,5,1 }, // v4  F403 F251
+				{ 2,5,1, 4,0,3 }, // v2  F251 F403
+				{ 2,5,3, 4,0,1 }, // v3  F253 F401
+				{ 4,5,1, 2,0,3 }, // v1  F451 F203
+				{ 4,5,3, 2,0,1 }, // v0  F453 F201
+			};
+			static const EManipPart which_arrow[6] = {
+				LL_Z_ARROW,
+				LL_X_ARROW,
+				LL_Y_ARROW,
+				LL_X_ARROW,
+				LL_Y_ARROW,
+				LL_Z_ARROW};
+
+			// draw arrows for deeper faces first, closer faces last
+			LLVector3 camera_axis;
+			if (gSelectMgr->getSelectType() == SELECT_TYPE_HUD)
+			{
+				camera_axis = LLVector3::x_axis;
+			}
+			else
+			{
+				camera_axis.setVec(gAgent.getCameraPositionAgent() - first_object->getPositionAgent());
+			}
+
+			for (U32 i = 0; i < NUM_AXES*2; i++)
+			{				
+				U32 face = face_list[nearest][i];
+
+				LLVector3 arrow_axis;
+				getManipAxis(first_object, which_arrow[face], arrow_axis);
+
+				if (fabs(angle_between(camera_axis, arrow_axis) - F_PI_BY_TWO) < F_PI_BY_TWO - HANDLE_HIDE_ANGLE)
+				{
+					renderArrow(which_arrow[face],
+								mManipPart,
+								(face >= 3) ? -mConeSize : mConeSize,
+								(face >= 3) ? -mArrowLengthMeters : mArrowLengthMeters,
+								mConeSize,
+								FALSE);
+				}
+			}
+		}
+	}
+	glPopMatrix();
+}
+
+
+void LLManipTranslate::renderArrow(S32 which_arrow, S32 selected_arrow, F32 box_size, F32 arrow_size, F32 handle_size, BOOL reverse_direction)
+{
+	LLGLSNoTexture gls_ui_no_texture;
+	LLGLEnable gls_blend(GL_BLEND);
+	LLGLEnable gls_color_material(GL_COLOR_MATERIAL);
+	
+	for (S32 pass = 1; pass <= 2; pass++)
+	{	
+		LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE, pass == 1 ? GL_LEQUAL : GL_GREATER);
+		glPushMatrix();
+			
+		S32 index = 0;
+	
+		index = ARROW_TO_AXIS[which_arrow];
+		
+		// assign a color for this arrow
+		LLColor4 color;  // black
+		if (which_arrow == selected_arrow || which_arrow == mHighlightedPart)
+		{
+			color.mV[index] = (pass == 1) ? 1.f : 0.5f;
+		}
+		else if (selected_arrow != LL_NO_PART)
+		{
+			color.mV[VALPHA] = 0.f;
+		}
+		else 
+		{
+			color.mV[index] = pass == 1 ? .8f : .35f ;			// red, green, or blue
+			color.mV[VALPHA] = 0.6f;
+		}
+		glColor4fv( color.mV );
+
+		LLVector3 vec;
+
+		{
+//			Stipple looks OK, but not great - SJB
+// 			LLGLEnable stipple(GL_LINE_STIPPLE);
+// 			glLineStipple(1, 0x3333);
+
+			LLUI::setLineWidth(2.0f);
+			glBegin(GL_LINES);
+				vec.mV[index] = box_size;
+				glVertex3f(vec.mV[0], vec.mV[1], vec.mV[2]);
+
+				vec.mV[index] = arrow_size;
+				glVertex3f(vec.mV[0], vec.mV[1], vec.mV[2]);
+			glEnd();
+			LLUI::setLineWidth(1.0f);
+		}
+		
+		glTranslatef(vec.mV[0], vec.mV[1], vec.mV[2]);
+		glScalef(handle_size, handle_size, handle_size);
+
+		F32 rot = 0.0f;
+		LLVector3 axis;
+
+		switch(which_arrow)
+		{
+		case LL_X_ARROW:
+			rot = reverse_direction ? -90.0f : 90.0f;
+			axis.mV[1] = 1.0f;
+			break;
+		case LL_Y_ARROW:
+			rot = reverse_direction ? 90.0f : -90.0f;
+			axis.mV[0] = 1.0f;
+			break;
+		case LL_Z_ARROW:
+			rot = reverse_direction ? 180.0f : 0.0f;
+			axis.mV[0] = 1.0f;
+			break;
+		default:
+			llerrs << "renderArrow called with bad arrow " << which_arrow << llendl;
+			break;
+		}
+
+		glRotatef(rot, axis.mV[0], axis.mV[1], axis.mV[2]);
+		glScalef(mArrowScales.mV[index], mArrowScales.mV[index], mArrowScales.mV[index] * 1.5f);
+
+		gCone.render(CONE_LOD_HIGHEST);
+
+		glPopMatrix();
+	}
+}
+
+void LLManipTranslate::renderGridVert(F32 x_trans, F32 y_trans, F32 r, F32 g, F32 b, F32 alpha)
+{
+	glColor4f(r, g, b, alpha);
+	switch (mManipPart)
+	{
+	case LL_YZ_PLANE:
+		glVertex3f(0, x_trans, y_trans);
+		break;
+	case LL_XZ_PLANE:
+		glVertex3f(x_trans, 0, y_trans);
+		break;
+	case LL_XY_PLANE:
+		glVertex3f(x_trans, y_trans, 0);
+		break;
+	default:
+		glVertex3f(0,0,0);
+		break;
+	}
+
+}