ReSit added, channel in dialog messaged added, local teleports have no delay after teleporting, message log crash fixed, hopefully...

indra/newview/llviewerdisplay.cpp

@@ -384,6 +384,9 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
 			gAgent.setTeleportMessage(
 				LLAgent::sTeleportProgressMessages["arriving"]);
 			gImageList.mForceResetTextureStats = TRUE;
+			// <edit>
+			if(gAgent.getFocusOnAvatar())
+			// </edit>
 			gAgent.resetView(TRUE, TRUE);
 			break;
 
@@ -407,7 +410,10 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
 			// Short delay when teleporting in the same sim (progress screen active but not shown - did not
 			// fall-through from TELEPORT_START)
 			{
-				if( gTeleportDisplayTimer.getElapsedTimeF32() > TELEPORT_LOCAL_DELAY )
+				// <edit>
+				// is this really needed.... I say no.
+				//if( gTeleportDisplayTimer.getElapsedTimeF32() > TELEPORT_LOCAL_DELAY )
+				// </edit>
 				{
 					LLFirstUse::useTeleport();
 					gAgent.setTeleportState( LLAgent::TELEPORT_NONE );