path-405: Avatar is no longer frozen when pathing window is up and when avatar crosses a region boundary the resident is informed with a message in the pathing window.

1 files changed, 9 insertions, 0 deletions

diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp
index 676287c0ad..9fd77546eb 100644
--- a/indra/newview/llworld.cpp
+++ b/indra/newview/llworld.cpp
@@ -55,6 +55,7 @@
 #include "message.h"
 #include "pipeline.h"
 #include "llappviewer.h"		// for do_disconnect()
+#include "llfloaterpathfindingconsole.h"
 
 #include <deque>
 #include <queue>
@@ -1091,6 +1092,14 @@ void process_region_handshake(LLMessageSystem* msg, void** user_data)
 	}
 
 	regionp->unpackRegionHandshake();
+	 

+	LLFloaterPathfindingConsole* pWindow = LLFloaterPathfindingConsole::getInstanceHandle().get();

+	if ( pWindow && pWindow->getHeartBeat() )

+	{

+		pWindow->regionCrossingOccured();

+		return;

+	}

+
 }