diff options
| author | Callum Prentice <callum@lindenlab.com> | 2014-02-13 16:16:24 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2014-02-13 16:16:24 -0800 |
| commit | 95f859dc22724611f4a1d2dc91e0c1769ec1e632 (patch) | |
| tree | 3083719871df0fa6627b7a30514bfef3ad5de816 /indra/newview/llfloaterregioninfo.cpp | |
| parent | c5fff11a76613b366216bcd262dfddfd0cc2a6a3 (diff) | |
| parent | 413be91cf5044889ade97dcbec4b17fceff122e3 (diff) | |
Merge with viewer-release
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; } |