diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-12-10 17:18:29 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-12-10 17:18:29 +0000 |
| commit | a20b5bd51e5d1c193ebeff6bc4539c3385bd6e00 (patch) | |
| tree | 44f996bdb0d5d5b68561cf9a6bc86be7f971c2ca /indra/newview/llenvironment.cpp | |
| parent | ca336f26db4446b016ab89654bf75f7651294533 (diff) | |
| parent | 6762c4515a9b0f98164d6efd191abec5ca4dd211 (diff) | |
Merged in andreykproductengine/maint-eep (pull request #210)
SL-10091 and SL-1894
Approved-by: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Diffstat (limited to 'indra/newview/llenvironment.cpp')
| -rw-r--r-- | indra/newview/llenvironment.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/llenvironment.cpp b/indra/newview/llenvironment.cpp index 20021fb075..d8095ad2ce 100644 --- a/indra/newview/llenvironment.cpp +++ b/indra/newview/llenvironment.cpp @@ -364,6 +364,7 @@ void LLEnvironment::initSingleton() //TODO: This frequently results in one more request than we need. It isn't breaking, but should be nicer. // We need to know new env version to fix this, without it we can only do full re-request + // Happens: on updates, on opening LLFloaterRegionInfo, on region crossing if info floater is open LLRegionInfoModel::instance().setUpdateCallback([this]() { requestRegion(); }); gAgent.addRegionChangedCallback([this]() { onRegionChange(); }); |