From 163ae605be8871f37f19d94b71ec4370aadf9a49 Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Mon, 20 Aug 2018 16:54:39 -0700 Subject: MAINT-9019: One last potential null ptr reference. --- indra/newview/llpanelenvironment.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/newview') diff --git a/indra/newview/llpanelenvironment.cpp b/indra/newview/llpanelenvironment.cpp index e52863c6ef..6de17cbee9 100644 --- a/indra/newview/llpanelenvironment.cpp +++ b/indra/newview/llpanelenvironment.cpp @@ -125,7 +125,7 @@ void LLPanelEnvironmentInfo::refresh() if (gDisconnected) return; - if (((mCurrentEnvironment->mParcelId != INVALID_PARCEL_ID) && (!mCurrentEnvironment->mDayCycle)) || + if ((!mCurrentEnvironment->mDayCycle) || ((mCurrentEnvironment->mParcelId == INVALID_PARCEL_ID) && (mCurrentEnvironment->mDayCycle->getAssetId() == LLSettingsDay::GetDefaultAssetId() ))) { getChild(RDG_ENVIRONMENT_SELECT)->setSelectedIndex(0); -- cgit v1.2.3