diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-08-31 11:47:18 -0700 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-08-31 11:47:18 -0700 |
| commit | 3b10414c632e73d66d2840ddcd474a79fa120540 (patch) | |
| tree | 2d216ef5de0138cf347f9fbbc04defecc618b420 /indra/newview | |
| parent | cb7592e4904ce4dcfb472d24b2da50bf50351091 (diff) | |
Adding optional flags to settings objects.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llenvironment.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llenvironment.cpp b/indra/newview/llenvironment.cpp index 6e19df0a94..3a1aec6319 100644 --- a/indra/newview/llenvironment.cpp +++ b/indra/newview/llenvironment.cpp @@ -444,11 +444,15 @@ F32 LLEnvironment::getWaterHeight() const bool LLEnvironment::getIsSunUp() const { + if (!mCurrentEnvironment || !mCurrentEnvironment->getSky()) + return false; return mCurrentEnvironment->getSky()->getIsSunUp(); } bool LLEnvironment::getIsMoonUp() const { + if (!mCurrentEnvironment || !mCurrentEnvironment->getSky()) + return false; return mCurrentEnvironment->getSky()->getIsMoonUp(); } |