diff options
| author | Graham Madarasz <graham@lindenlab.com> | 2019-05-28 16:23:56 +0000 |
|---|---|---|
| committer | Graham Madarasz <graham@lindenlab.com> | 2019-05-28 16:23:56 +0000 |
| commit | ee229e0f0b64de1a8b5020788141aa47bcaa938a (patch) | |
| tree | c9057416ac0de59a51c9e53152009239f164c515 /indra/newview/llpaneleditwater.cpp | |
| parent | 6aa393f7f50ca30b65391f4ae230a3357092f3cd (diff) | |
| parent | fdf0d49614b820ffa85d2aa9258e4592bc0e45f3 (diff) | |
Merged in maxim_productengine/viewer-eep (pull request #406)
SL-11279 and SL-11273 fixes
Diffstat (limited to 'indra/newview/llpaneleditwater.cpp')
| -rw-r--r-- | indra/newview/llpaneleditwater.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpaneleditwater.cpp b/indra/newview/llpaneleditwater.cpp index 1f9c79c9eb..d8b97b714b 100644 --- a/indra/newview/llpaneleditwater.cpp +++ b/indra/newview/llpaneleditwater.cpp @@ -130,7 +130,7 @@ void LLPanelSettingsWaterMainTab::setEnabled(BOOL enabled) //========================================================================== void LLPanelSettingsWaterMainTab::refresh() { - if (!mWaterSettings) + if (!mWaterSettings || !getCanChangeSettings()) { setAllChildrenEnabled(FALSE); setEnabled(FALSE); |