diff options
| author | callum_linden <none@none> | 2018-03-01 14:33:47 -0800 |
|---|---|---|
| committer | callum_linden <none@none> | 2018-03-01 14:33:47 -0800 |
| commit | f4867d032dfe93b249eb188f071cb309e3a7b23e (patch) | |
| tree | 144bb92ed630302d1d68910069ad2505946eb471 /indra/newview/llpanelmediasettingsgeneral.h | |
| parent | 278382abd72a02b5e190cb259d2b4806f3908902 (diff) | |
| parent | f8c76535a35aaf245e261357a59e977bac5b2501 (diff) | |
Automated merge with tip of viewer-release
Diffstat (limited to 'indra/newview/llpanelmediasettingsgeneral.h')
| -rw-r--r-- | indra/newview/llpanelmediasettingsgeneral.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpanelmediasettingsgeneral.h b/indra/newview/llpanelmediasettingsgeneral.h index 0ae1401ab2..06793d91fc 100644 --- a/indra/newview/llpanelmediasettingsgeneral.h +++ b/indra/newview/llpanelmediasettingsgeneral.h @@ -59,7 +59,7 @@ public: void setParent( LLFloaterMediaSettings* parent ); static void initValues( void* userdata, const LLSD& media_settings ,bool editable); - static void clearValues( void* userdata, bool editable); + static void clearValues( void* userdata, bool editable, bool update_preview = true); // Navigates the current selected face to the Home URL. // If 'only_if_current_is_empty' is "true", it only performs |