diff options
| author | Rider Linden <rider@lindenlab.com> | 2019-01-25 16:54:56 +0000 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2019-01-25 16:54:56 +0000 |
| commit | 9246be072101e4e09f6ab2655eb78939242bac3f (patch) | |
| tree | a352a7dcda12c60519f1d6c56b55a3bbc2e9c3a8 /indra/newview | |
| parent | b33f9c4533b1d2f539baf65820ccb07a89389e72 (diff) | |
| parent | 7c1594090e8ec3a0509b22e4d650e03fbf26fadc (diff) | |
Merged in maxim_productengine/viewer-eep (pull request #235)
SL-10331 FIXED [EEP] Apply to Region/Parcel from the day editor sticks
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llpanelenvironment.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelenvironment.cpp b/indra/newview/llpanelenvironment.cpp index 000c7050ab..55b579d0a2 100644 --- a/indra/newview/llpanelenvironment.cpp +++ b/indra/newview/llpanelenvironment.cpp @@ -373,7 +373,7 @@ void LLPanelEnvironmentInfo::updateEditFloater(const LLEnvironment::EnvironmentI { LLFloaterEditExtDayCycle *dayeditor(getEditFloater(false)); - if (!dayeditor) + if (!dayeditor || !dayeditor->isInVisibleChain()) return; if (!nextenv || !nextenv->mDayCycle || !enable) |