diff options
| author | dolphin <dolphin@lindenlab.com> | 2014-02-12 14:31:37 -0800 |
|---|---|---|
| committer | dolphin <dolphin@lindenlab.com> | 2014-02-12 14:31:37 -0800 |
| commit | 7c3e51b05cfe8757bc72a8b5c19eff307b1e501f (patch) | |
| tree | 8c3b36a820d7ea3eae7d0bb7bc544f8548986f02 /indra/newview/llfloaterregioninfo.cpp | |
| parent | 8b690a3fdfb24aea23150031768e0734043195aa (diff) | |
| parent | 413be91cf5044889ade97dcbec4b17fceff122e3 (diff) | |
Merge with 3.7.0
Diffstat (limited to 'indra/newview/llfloaterregioninfo.cpp')
| -rwxr-xr-x | indra/newview/llfloaterregioninfo.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp index e1cfc036ca..b7f66a2c0b 100755 --- a/indra/newview/llfloaterregioninfo.cpp +++ b/indra/newview/llfloaterregioninfo.cpp @@ -91,6 +91,7 @@ #include "lltrans.h" #include "llagentui.h" #include "llmeshrepository.h" +#include "llfloaterregionrestarting.h" #include "llpanelexperiencelisteditor.h" #include <boost/function.hpp> #include "llfloaterexperiencepicker.h" @@ -231,7 +232,7 @@ BOOL LLFloaterRegionInfo::postBuild() &processEstateOwnerRequest); // Request region info when agent region changes. - LLEnvManagerNew::instance().setRegionChangeCallback(boost::bind(&LLFloaterRegionInfo::requestRegionInfo, this)); + gAgent.addRegionChangedCallback(boost::bind(&LLFloaterRegionInfo::requestRegionInfo, this)); return TRUE; } |