From e558f5cb0b8c0937da0f08a1af149afbc497462c Mon Sep 17 00:00:00 2001 From: prep Date: Mon, 12 Mar 2012 15:04:09 -0400 Subject: 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. --- indra/newview/llworld.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'indra/newview/llworld.cpp') 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 #include @@ -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; + } + } -- cgit v1.2.3