EFFECTIVE MERGE: svn merge -r 69928:70806 svn+ssh://svn/svn/linden/branches/maintenance-1 && svn merge -r 70948:70949 svn+ssh://svn/svn/linden/branches/maintenance-1-qa into release

ACTUAL MERGE: svn merge -r 71430:71431 svn+ssh://svn/svn/linden/qa/maintenance-1-merge-71429 into release

1 files changed, 29 insertions, 6 deletions

diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index af16a4d3fa..d48fa405ba 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -3272,7 +3272,6 @@ void LLSelectMgr::deselectAll()
 	mLastSentSelectionCenterGlobal.clearVec();
 
 	updatePointAt();
-	updateSelectionCenter();
 }
 
 void LLSelectMgr::deselectUnused()
@@ -5302,11 +5301,8 @@ void LLSelectMgr::updateSelectionCenter()
 		mShowSelection = FALSE;
 		mSelectionBBox = LLBBox(); 
 		mPauseRequest = NULL;
-		if (gAgent.getAvatarObject())
-		{
-			gAgent.getAvatarObject()->mHUDTargetZoom = 1.f;
-			gAgent.getAvatarObject()->mHUDCurZoom = 1.f;
-		}
+		resetAgentHUDZoom();
+
 	}
 	else
 	{
@@ -5604,6 +5600,33 @@ BOOL LLSelectMgr::setForceSelection(BOOL force)
 	return force; 
 }
 
+void LLSelectMgr::resetAgentHUDZoom()
+{
+	if (gAgent.getAvatarObject())
+	{
+		gAgent.getAvatarObject()->mHUDTargetZoom = 1.f;
+		gAgent.getAvatarObject()->mHUDCurZoom = 1.f;
+	}
+}
+
+void LLSelectMgr::getAgentHUDZoom(F32 &target_zoom, F32 &current_zoom) const
+{
+	if (gAgent.getAvatarObject())
+	{
+		target_zoom = gAgent.getAvatarObject()->mHUDTargetZoom;
+		current_zoom = gAgent.getAvatarObject()->mHUDCurZoom;
+	}
+}
+
+void LLSelectMgr::setAgentHUDZoom(F32 target_zoom, F32 current_zoom)
+{
+	if (gAgent.getAvatarObject())
+	{
+		gAgent.getAvatarObject()->mHUDTargetZoom = target_zoom;
+		gAgent.getAvatarObject()->mHUDCurZoom = current_zoom;
+	}
+}
+
 LLObjectSelection::LLObjectSelection() : 
 	LLRefCount(),
 	mSelectType(SELECT_TYPE_WORLD)