diff options
author | Baker Linden <baker@lindenlab.com> | 2014-02-11 15:37:51 -0800 |
---|---|---|
committer | Baker Linden <baker@lindenlab.com> | 2014-02-11 15:37:51 -0800 |
commit | 6580df1ed745b8d5b782fb4bfb9bf7b86660b103 (patch) | |
tree | 314d81e8b63d4e109e6494e92996a26e1f5910e2 /indra/newview/llfloaterpathfindingconsole.cpp | |
parent | c894c53449ee7ed096e3ecdcf5c1f32cecb392ba (diff) | |
parent | 413be91cf5044889ade97dcbec4b17fceff122e3 (diff) |
viewer-release merge
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()) |