diff options
| author | simon <none@none> | 2014-02-10 16:11:50 -0800 |
|---|---|---|
| committer | simon <none@none> | 2014-02-10 16:11:50 -0800 |
| commit | cb2045fcd5106b5e0028869fc6a3e080d3f8e779 (patch) | |
| tree | 8270c7d248f542107472fff9f2eb10f30721e1ee /indra/newview/llfloaterpathfindingobjects.cpp | |
| parent | 8e5da5125de2bc9f8ce5ed2677556953e008c59d (diff) | |
| parent | 4acc2dc2736621952b6ee0e808640dcf79e341c6 (diff) | |
Merge downstream code with 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()) |