diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-07-21 20:11:56 +0000 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-07-21 20:11:56 +0000 |
| commit | 8153e7d63923a0022ffc1d6f526d4be57d34ba3d (patch) | |
| tree | 596d38d591177ccc2ffef695b6f79437c5efce97 /indra/newview/llfloaterregioninfo.cpp | |
| parent | 6362aa300766484909cdfc8884edf3e6744fc727 (diff) | |
| parent | 19d063952c4706d4344f207775aa5dfdff8802fd (diff) | |
Merged in merge-6.4.6 (pull request #207)
Merge master 6.4.6 into DRTVWR-510 (VS2017 update)
Diffstat (limited to 'indra/newview/llfloaterregioninfo.cpp')
| -rw-r--r-- | indra/newview/llfloaterregioninfo.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp index 8bcc5bbe7a..ec1909d02a 100644 --- a/indra/newview/llfloaterregioninfo.cpp +++ b/indra/newview/llfloaterregioninfo.cpp @@ -637,11 +637,7 @@ void LLFloaterRegionInfo::refreshFromRegion(LLViewerRegion* region) mInfoPanels.begin(), mInfoPanels.end(), llbind2nd( -#if LL_WINDOWS - std::mem_fun1(&LLPanelRegionInfo::refreshFromRegion), -#else std::mem_fun(&LLPanelRegionInfo::refreshFromRegion), -#endif region)); mEnvironmentPanel->refreshFromRegion(region); } |