summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2018-08-20 16:54:39 -0700
committerRider Linden <rider@lindenlab.com>2018-08-20 16:54:39 -0700
commit163ae605be8871f37f19d94b71ec4370aadf9a49 (patch)
tree76be49c8332d29a6bed0d48940b6944b084f7957
parentb2b3c36bda988be4b433e9f97f13bc1c67722eb7 (diff)
MAINT-9019: One last potential null ptr reference.
-rw-r--r--indra/newview/llpanelenvironment.cpp2
1 files changed, 1 insertions, 1 deletions
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<LLRadioGroup>(RDG_ENVIRONMENT_SELECT)->setSelectedIndex(0);