diff options
author | Ankur Ahlawat <anchor@lindenlab.com> | 2018-03-07 10:00:07 -0800 |
---|---|---|
committer | Ankur Ahlawat <anchor@lindenlab.com> | 2018-03-07 10:00:07 -0800 |
commit | ac558e384214e22b4a8da2045854e2180b7428bf (patch) | |
tree | 7de576ff5552cbb9956c6cdf0e4d84b52514316e /indra/newview/llpanelmediasettingsgeneral.cpp | |
parent | 485193c7f530fa3d8574c74304e452ab6d012e41 (diff) | |
parent | f8c76535a35aaf245e261357a59e977bac5b2501 (diff) |
Merged lindenlab/viewer-release into default
Diffstat (limited to 'indra/newview/llpanelmediasettingsgeneral.cpp')
-rw-r--r-- | indra/newview/llpanelmediasettingsgeneral.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llpanelmediasettingsgeneral.cpp b/indra/newview/llpanelmediasettingsgeneral.cpp index d7c43c224c..3522189842 100644 --- a/indra/newview/llpanelmediasettingsgeneral.cpp +++ b/indra/newview/llpanelmediasettingsgeneral.cpp @@ -196,7 +196,7 @@ void LLPanelMediaSettingsGeneral::draw() //////////////////////////////////////////////////////////////////////////////// // static -void LLPanelMediaSettingsGeneral::clearValues( void* userdata, bool editable) +void LLPanelMediaSettingsGeneral::clearValues( void* userdata, bool editable, bool update_preview) { LLPanelMediaSettingsGeneral *self =(LLPanelMediaSettingsGeneral *)userdata; self->mAutoLoop->clear(); @@ -217,7 +217,10 @@ void LLPanelMediaSettingsGeneral::clearValues( void* userdata, bool editable) self->mHeightPixels ->setEnabled(editable); self->mHomeURL ->setEnabled(editable); self->mWidthPixels ->setEnabled(editable); - self->updateMediaPreview(); + if (update_preview) + { + self->updateMediaPreview(); + } } // static |