diff options
author | Merov Linden <merov@lindenlab.com> | 2014-02-10 21:07:21 -0800 |
---|---|---|
committer | Merov Linden <merov@lindenlab.com> | 2014-02-10 21:07:21 -0800 |
commit | 2e948a8dc678d3bb5f1d4f34a04efac79b952187 (patch) | |
tree | 601637c76d2118a803ee79f91339453e1bc5f676 /indra/newview/llfloaterregioninfo.cpp | |
parent | bd800bc2efbba57b66c4a776ac399b3680d184b5 (diff) | |
parent | 413be91cf5044889ade97dcbec4b17fceff122e3 (diff) |
Pull merge from lindenlab/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; } |