diff options
author | Tank_Master <tank.master@phoenixviewer.com> | 2014-03-10 12:07:59 -0700 |
---|---|---|
committer | Tank_Master <tank.master@phoenixviewer.com> | 2014-03-10 12:07:59 -0700 |
commit | 328f64b4b9b870661a6d0bb8947dc1ff410ca0f8 (patch) | |
tree | 769bd24c2300307846e316e230db5dadb641611a /indra/newview/llfloaterpathfindingobjects.cpp | |
parent | 061eee57d9a56bd50fbe2a8f84b3cff99f63ebfc (diff) | |
parent | 1ad94b5a9a8d0b6d095938148cbf8b1b56a778bf (diff) |
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()) |