diff options
| author | Jonathan Yap <none@none> | 2013-11-19 16:56:17 -0500 |
|---|---|---|
| committer | Jonathan Yap <none@none> | 2013-11-19 16:56:17 -0500 |
| commit | 410a084f9a2e030efda635f5a51280b599ab7f78 (patch) | |
| tree | 2c2f095cee8cf0b233d59eee2c8d99ad68c44c70 /indra/newview/llfloaterpathfindingconsole.cpp | |
| parent | dad992ea31b6b823c316400e61d50d1aa9e52330 (diff) | |
| parent | fcc885d4fc5ef63dad33e89a9324edc39d466d37 (diff) | |
STORM-1980 Merge changes Oz made (new way of detecting an agent has changed regions)
Modify code to make use of the changed callback
Diffstat (limited to 'indra/newview/llfloaterpathfindingconsole.cpp')
| -rwxr-xr-x | indra/newview/llfloaterpathfindingconsole.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterpathfindingconsole.cpp b/indra/newview/llfloaterpathfindingconsole.cpp index 298454724b..161259d049 100755 --- a/indra/newview/llfloaterpathfindingconsole.cpp +++ b/indra/newview/llfloaterpathfindingconsole.cpp @@ -34,11 +34,11 @@ #include <boost/signals2.hpp> +#include "llagent.h" #include "llbutton.h" #include "llcheckboxctrl.h" #include "llcombobox.h" #include "llcontrol.h" -#include "llenvmanager.h" #include "llfloaterpathfindingcharacters.h" #include "llfloaterpathfindinglinksets.h" #include "llfloaterreg.h" @@ -224,7 +224,7 @@ void LLFloaterPathfindingConsole::onOpen(const LLSD& pKey) if (!mRegionBoundarySlot.connected()) { - mRegionBoundarySlot = LLEnvManagerNew::instance().setRegionChangeCallback(boost::bind(&LLFloaterPathfindingConsole::onRegionBoundaryCross, this)); + mRegionBoundarySlot = gAgent.addRegionChangedCallback(boost::bind(&LLFloaterPathfindingConsole::onRegionBoundaryCross, this)); } if (!mTeleportFailedSlot.connected()) |