diff options
author | simon <none@none> | 2014-02-10 15:42:25 -0800 |
---|---|---|
committer | simon <none@none> | 2014-02-10 15:42:25 -0800 |
commit | 4acc2dc2736621952b6ee0e808640dcf79e341c6 (patch) | |
tree | 9decb3ccc69bfee8fcaeb583bf0c6f6afd7b1243 /indra/newview/llfloaterpathfindingobjects.cpp | |
parent | 1be85e1a0a2a2d607c74acb684412b6c3b307e6f (diff) | |
parent | 413be91cf5044889ade97dcbec4b17fceff122e3 (diff) |
Merge viewer-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()) |