diff options
| author | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-02-05 17:50:26 +0200 |
|---|---|---|
| committer | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-02-05 17:50:26 +0200 |
| commit | 166ac89de9bcf951103cbf2551a133ebe9e43035 (patch) | |
| tree | 21f23a3841592edef65f940274b5b59b662e2ba6 /indra/newview/llpanelmediasettingsgeneral.h | |
| parent | ac8753a7eaab05b47d7da6e5ae8ef5f3aa324273 (diff) | |
| parent | 77b5a39cc1daa79ceea599aea3f680127c9949b1 (diff) | |
merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llpanelmediasettingsgeneral.h')
| -rw-r--r-- | indra/newview/llpanelmediasettingsgeneral.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llpanelmediasettingsgeneral.h b/indra/newview/llpanelmediasettingsgeneral.h index 5f90321362..a3f0990f35 100644 --- a/indra/newview/llpanelmediasettingsgeneral.h +++ b/indra/newview/llpanelmediasettingsgeneral.h @@ -54,7 +54,8 @@ public: // Hook that the floater calls before applying changes from the panel void preApply(); // Function that asks the panel to fill in values associated with the panel - void getValues(LLSD &fill_me_in); + // 'include_tentative' means fill in tentative values as well, otherwise do not + void getValues(LLSD &fill_me_in, bool include_tentative = true); // Hook that the floater calls after applying changes to the panel void postApply(); |