diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-02-11 16:04:31 -0500 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2014-02-11 16:04:31 -0500 |
commit | 969cb45920c568aeebf145480b7beacb2a157bcf (patch) | |
tree | 63dfb29d5e0226b054094d88358bec6ede68c197 /indra/newview/llfloaterregioninfo.cpp | |
parent | d8f627d8bd45cc356583e2251500c23bed836b16 (diff) | |
parent | 413be91cf5044889ade97dcbec4b17fceff122e3 (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 eb0a201e69..cd80b9b3c1 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; } |