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/llfloaterpathfindingobjects.cpp | |
parent | c894c53449ee7ed096e3ecdcf5c1f32cecb392ba (diff) | |
parent | 413be91cf5044889ade97dcbec4b17fceff122e3 (diff) |
viewer-release merge
Diffstat (limited to 'indra/newview/llfloaterpathfindingobjects.cpp')
-rwxr-xr-x | indra/newview/llfloaterpathfindingobjects.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llfloaterpathfindingobjects.cpp b/indra/newview/llfloaterpathfindingobjects.cpp index 20c1215bcb..d72ee073e1 100755 --- a/indra/newview/llfloaterpathfindingobjects.cpp +++ b/indra/newview/llfloaterpathfindingobjects.cpp @@ -41,7 +41,6 @@ #include "llavatarnamecache.h" #include "llbutton.h" #include "llcheckboxctrl.h" -#include "llenvmanager.h" #include "llfloater.h" #include "llfontgl.h" #include "llnotifications.h" @@ -85,7 +84,7 @@ void LLFloaterPathfindingObjects::onOpen(const LLSD &pKey) if (!mRegionBoundaryCrossingSlot.connected()) { - mRegionBoundaryCrossingSlot = LLEnvManagerNew::getInstance()->setRegionChangeCallback(boost::bind(&LLFloaterPathfindingObjects::onRegionBoundaryCrossed, this)); + mRegionBoundaryCrossingSlot = gAgent.addRegionChangedCallback(boost::bind(&LLFloaterPathfindingObjects::onRegionBoundaryCrossed, this)); } if (!mGodLevelChangeSlot.connected()) |