diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2021-11-04 16:40:05 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2021-11-19 14:53:12 -0500 |
| commit | 106d52c6ee9b10dd7a7baca3b09a01073c61949d (patch) | |
| tree | da019ccfc59fc492d1567cc71d5646bf15fc4d29 /indra/newview/llenvironment.cpp | |
| parent | fdeeb0190eb6fa2d6b39816d14a664f5d38aa4ec (diff) | |
SL-16202: Instantiate LLSimpleton::sInstance generically
instead of requiring a separate declaration for each subclass.
The previous way produces errors in clang.
(cherry picked from commit 8458ad8890cf0a11804996210d7bcfbdaa3eec2e)
Diffstat (limited to 'indra/newview/llenvironment.cpp')
| -rw-r--r-- | indra/newview/llenvironment.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/llenvironment.cpp b/indra/newview/llenvironment.cpp index 0b914f07ab..4bec7fa111 100644 --- a/indra/newview/llenvironment.cpp +++ b/indra/newview/llenvironment.cpp @@ -824,7 +824,6 @@ std::string env_selection_to_string(LLEnvironment::EnvSelection_t sel) #undef RTNENUM } -LLEnvironment* LLSimpleton<LLEnvironment>::sInstance = nullptr; //------------------------------------------------------------------------- LLEnvironment::LLEnvironment(): mCloudScrollDelta(), |