diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-01-07 13:44:22 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-01-07 13:44:22 -0500 |
| commit | a25bcb8523db08877c47fdbd834589ebbe45ff82 (patch) | |
| tree | d0b6eb160a82aff8564522d88f4ead80704533c9 /indra/newview/llfloaterpathfindingobjects.cpp | |
| parent | 94ac0ffdc30842834bb8b0b6e229b21c7707c026 (diff) | |
| parent | 24c5ac7417f8b32c39dd5defec21845bd03786c4 (diff) | |
merge changes for storm-1980
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()) |