diff options
author | Tank_Master <tank.master@phoenixviewer.com> | 2014-03-10 12:07:59 -0700 |
---|---|---|
committer | Tank_Master <tank.master@phoenixviewer.com> | 2014-03-10 12:07:59 -0700 |
commit | 328f64b4b9b870661a6d0bb8947dc1ff410ca0f8 (patch) | |
tree | 769bd24c2300307846e316e230db5dadb641611a /indra/newview/llfloaterregioninfo.cpp | |
parent | 061eee57d9a56bd50fbe2a8f84b3cff99f63ebfc (diff) | |
parent | 1ad94b5a9a8d0b6d095938148cbf8b1b56a778bf (diff) |
Merge
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 66bf49331b..73c0963a1d 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" const S32 TERRAIN_TEXTURE_COUNT = 4; const S32 CORNER_COUNT = 4; @@ -219,7 +220,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; } |