diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-03-13 10:34:25 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-03-13 10:34:25 -0700 |
| commit | a8d5d6f45e34ff965fd9adc1d9824eb2840171a3 (patch) | |
| tree | 6a12ee343917f8aba9a0ec382e748430b8acd6e7 /indra/newview/llworld.cpp | |
| parent | b84db8354d992cfddfd64eb80ebd80c4b6baf3f8 (diff) | |
| parent | 87b414c4934d0d52eef0b323245568bb1e95ec70 (diff) | |
Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-development-havokai.
Diffstat (limited to 'indra/newview/llworld.cpp')
| -rw-r--r-- | indra/newview/llworld.cpp | 9 |
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;
+ }
+ } |