diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp
index 24eea1733..c74719a6e 100644
--- a/indra/newview/llagentcamera.cpp
+++ b/indra/newview/llagentcamera.cpp
@@ -161,7 +161,6 @@ LLAgentCamera::LLAgentCamera() :
 	mFocusObjectDist(0.f),
 	mFocusObjectOffset(),
 	mFocusDotRadius( 0.1f ),			// meters
-	mTrackFocusObject(TRUE),
 	mUIOffset(0.f),
 
 	mAtKey(0), // Either 1, 0, or -1... indicates that movement-key is pressed
@@ -225,7 +224,6 @@ void LLAgentCamera::init()
 	mCurrentCameraDistance = getCameraOffsetInitial().magVec() * gSavedSettings.getF32("CameraOffsetScale");
 	mTargetCameraDistance = mCurrentCameraDistance;
 	mCameraZoomFraction = 1.f;
-	mTrackFocusObject = gSavedSettings.getBOOL("TrackFocusObject");
 
 	mInitialized = true;
 }
@@ -1623,11 +1621,9 @@ LLVector3d LLAgentCamera::calcFocusPositionTargetGlobal()
 		{
 			LLDrawable* drawablep = mFocusObject->mDrawable;
 			
-			if (mTrackFocusObject &&
-				drawablep && 
-				drawablep->isActive())
+			if (gSavedSettings.getBOOL("TrackFocusObject") && drawablep)
 			{
-				if (!mFocusObject->isAvatar())
+				if (drawablep->isActive() && !mFocusObject->isAvatar())
 				{
 					if (mFocusObject->isSelected())
 					{
diff --git a/indra/newview/llagentcamera.h b/indra/newview/llagentcamera.h
index c18b493c2..3a2ced058 100644
--- a/indra/newview/llagentcamera.h
+++ b/indra/newview/llagentcamera.h
@@ -211,7 +211,6 @@ public:
 	void			setCameraPosAndFocusGlobal(const LLVector3d& pos, const LLVector3d& focus, const LLUUID &object_id);
 	void			clearFocusObject();
 	void			setFocusObject(LLViewerObject* object);
-	void			setObjectTracking(BOOL track) 	{ mTrackFocusObject = track; }
 	const LLVector3d &getFocusGlobal() const		{ return mFocusGlobal; }
 	const LLVector3d &getFocusTargetGlobal() const	{ return mFocusTargetGlobal; }
 private:
@@ -224,7 +223,6 @@ private:
 	F32				mFocusObjectDist;
 	LLVector3		mFocusObjectOffset;
 	F32				mFocusDotRadius; 				// Meters
-	BOOL			mTrackFocusObject;
 
 	//--------------------------------------------------------------------
 	// Lookat / Pointat
diff --git a/indra/newview/llmaniprotate.cpp b/indra/newview/llmaniprotate.cpp
index 33baf4231..b5f5d2c0c 100644
--- a/indra/newview/llmaniprotate.cpp
+++ b/indra/newview/llmaniprotate.cpp
@@ -500,7 +500,6 @@ BOOL LLManipRotate::handleMouseUp(S32 x, S32 y, MASK mask)
 		// Might have missed last update due to timing.
 		LLSelectMgr::getInstance()->sendMultipleUpdate( UPD_ROTATION | UPD_POSITION );
 		LLSelectMgr::getInstance()->enableSilhouette(TRUE);
-		//gAgent.setObjectTracking(gSavedSettings.getBOOL("TrackFocusObject"));
 
 		LLSelectMgr::getInstance()->updateSelectionCenter();
 		LLSelectMgr::getInstance()->saveSelectedObjectTransform(SELECT_ACTION_TYPE_PICK);
diff --git a/indra/newview/llmanipscale.cpp b/indra/newview/llmanipscale.cpp
index e1e6552f9..7392cb9c5 100644
--- a/indra/newview/llmanipscale.cpp
+++ b/indra/newview/llmanipscale.cpp
@@ -385,7 +385,6 @@ BOOL LLManipScale::handleMouseUp(S32 x, S32 y, MASK mask)
 		// Might have missed last update due to UPDATE_DELAY timing
 		LLSelectMgr::getInstance()->sendMultipleUpdate( mLastUpdateFlags );
 		
-		//gAgent.setObjectTracking(gSavedSettings.getBOOL("TrackFocusObject"));
 		LLSelectMgr::getInstance()->saveSelectedObjectTransform(SELECT_ACTION_TYPE_PICK);
 	}
 	return LLManip::handleMouseUp(x, y, mask);
diff --git a/indra/newview/llmaniptranslate.cpp b/indra/newview/llmaniptranslate.cpp
index 7c86889a1..847d6a572 100644
--- a/indra/newview/llmaniptranslate.cpp
+++ b/indra/newview/llmaniptranslate.cpp
@@ -1077,7 +1077,6 @@ BOOL LLManipTranslate::handleMouseUp(S32 x, S32 y, MASK mask)
 		
 		mInSnapRegime = FALSE;
 		LLSelectMgr::getInstance()->saveSelectedObjectTransform(SELECT_ACTION_TYPE_PICK);
-		//gAgent.setObjectTracking(gSavedSettings.getBOOL("TrackFocusObject"));
 	}
 
 	return LLManip::handleMouseUp(x, y, mask);
diff --git a/indra/newview/lltoolgrab.cpp b/indra/newview/lltoolgrab.cpp
index 6765f87bb..6170b7aca 100644
--- a/indra/newview/lltoolgrab.cpp
+++ b/indra/newview/lltoolgrab.cpp
@@ -983,8 +983,6 @@ BOOL LLToolGrab::handleMouseUp(S32 x, S32 y, MASK mask)
 		gGrabTransientTool = NULL;
 	}
 
-	//gAgent.setObjectTracking(gSavedSettings.getBOOL("TrackFocusObject"));
-
 	return TRUE;
 }