diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-01-07 15:15:59 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-01-07 15:15:59 -0500 |
| commit | fcac9fdaddaea6ec94d1c3726c8f19809d696169 (patch) | |
| tree | 1b7c9c8412323110664154e1189b7fa854b524ba /indra/newview/llfloaterpathfindingconsole.cpp | |
| parent | ad40f7534fdae6ec85597bbfce32e72248cd61fa (diff) | |
| parent | a25bcb8523db08877c47fdbd834589ebbe45ff82 (diff) | |
merge changes for Snowstorm fall contributions
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()) |