* EXT-1037 - Left-clicking anywhere in in-world area resets camera position

NOTE: Temporary fix that may break MOAP behavior. Needs to be reviewd and potentially designed.

indra/newview/llviewermediafocus.cpp

@@ -115,11 +115,14 @@ void LLViewerMediaFocus::setFocusFace( BOOL b, LLPointer<LLViewerObject> objectp
 	else
 	{
 		gFocusMgr.setKeyboardFocus(NULL);
-		mFocus = NULL;
 		if(! parcel->getMediaPreventCameraZoom())
 		{
-			gAgent.setFocusOnAvatar(TRUE, ANIMATE);
+			if (!mFocus->isEmpty())
+			{
+				gAgent.setFocusOnAvatar(TRUE, ANIMATE);
+			}
 		}
+		mFocus = NULL;
 		// LLViewerMedia::remObserver(this, mObjectID);
 		
 		// Null out the media hud media pointer