diff options
author | Oz Linden <oz@lindenlab.com> | 2014-03-03 17:01:19 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2014-03-03 17:01:19 -0500 |
commit | fbdbea1b180a8dbee24ec0909979f1a25844b5e0 (patch) | |
tree | 9f15883b61d240c3dfd7b6467f0be693cafd0f83 /indra/newview/llfloaterpathfindingobjects.cpp | |
parent | bfdd6a689caf04d1cb69d5bf90bef1886f774bd1 (diff) | |
parent | de8fea13627cc5978b8a6135802a52864a11c39a (diff) |
merge changes for 3.7.2-release
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()) |