diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2021-11-15 09:25:35 -0700 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2021-11-15 09:25:35 -0700 |
| commit | 029b41c0419e975bbb28454538b46dc69ce5d2ba (patch) | |
| tree | 4f9a28bb36ee07fe9a7b45a434384afd1f24bb85 /indra/newview/llenvironment.cpp | |
| parent | aeed774ff9cc55c0c1dd2784e23b2366ff367fbe (diff) | |
Revert "SL-16220: Merge branch 'origin/DRTVWR-546' into glthread"
This reverts commit 5188a26a8521251dda07ac0140bb129f28417e49, reversing
changes made to 819088563e13f1d75e048311fbaf0df4a79b7e19.
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 1a66f10b8f..dba24b3d02 100644 --- a/indra/newview/llenvironment.cpp +++ b/indra/newview/llenvironment.cpp @@ -824,6 +824,7 @@ std::string env_selection_to_string(LLEnvironment::EnvSelection_t sel) #undef RTNENUM } +LLEnvironment* LLSimpleton<LLEnvironment>::sInstance = nullptr; //------------------------------------------------------------------------- LLEnvironment::LLEnvironment(): mCloudScrollDelta(), |