diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-09-19 16:38:21 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-09-19 16:38:21 +0000 |
| commit | 800b08efd01d55c87b24c5b300c7f676af18413d (patch) | |
| tree | 8e8aaf1986b628aecf49763c0c7dab6a68b6cf7d /indra/newview/llpanelenvironment.cpp | |
| parent | 70a0fabdd8f7da5e486c7d182477008b5e851246 (diff) | |
| parent | ff8f5f52a49d7984909a1d2dcb89ad81a3cb7588 (diff) | |
Merged in andreykproductengine/maint-eep (pull request #99)
SL-9679 EEP - disable panel elements until data update, null cycle crash fix
Diffstat (limited to 'indra/newview/llpanelenvironment.cpp')
| -rw-r--r-- | indra/newview/llpanelenvironment.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llpanelenvironment.cpp b/indra/newview/llpanelenvironment.cpp index ecffa34ab9..bc06bde138 100644 --- a/indra/newview/llpanelenvironment.cpp +++ b/indra/newview/llpanelenvironment.cpp @@ -550,7 +550,7 @@ void LLPanelEnvironmentInfo::onBtnEdit() (LLFloaterEditExtDayCycle::KEY_CANMOD, LLSD::Boolean(true))); dayeditor->openFloater(params); - if (mCurrentEnvironment->mDayCycle) + if (mCurrentEnvironment && mCurrentEnvironment->mDayCycle) dayeditor->setEditDayCycle(mCurrentEnvironment->mDayCycle); else dayeditor->setEditDefaultDayCycle(); @@ -562,7 +562,7 @@ void LLPanelEnvironmentInfo::onBtnSelect() if (picker) { picker->setSettingsFilter(LLSettingsType::ST_NONE); - picker->setSettingsAssetId((mCurrentEnvironment->mDayCycle) ? mCurrentEnvironment->mDayCycle->getAssetId() : LLUUID::null); + picker->setSettingsAssetId((mCurrentEnvironment && mCurrentEnvironment->mDayCycle) ? mCurrentEnvironment->mDayCycle->getAssetId() : LLUUID::null); picker->openFloater(); picker->setFocus(TRUE); } |