diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2014-02-11 13:41:31 -0500 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2014-02-11 13:41:31 -0500 |
| commit | 744381956022c74b8617098ab28b52230dfbd0c2 (patch) | |
| tree | b53aafab1f3067c78bc0564bada8da9bff82a48f /indra/newview/llfloaterpathfindingobjects.cpp | |
| parent | 80ee8a8ca3725265636f8052a2442a74a742338f (diff) | |
| parent | 413be91cf5044889ade97dcbec4b17fceff122e3 (diff) | |
Merge. Refresh from viewer-release after 3.7.0 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()) |