diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-02-05 15:12:54 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-02-05 15:12:54 +0200 |
| commit | 312f5553aea988a3a795ee45d00be861c1fc3aa9 (patch) | |
| tree | 8676bad1bd1e68e90dfba505da5d2fcf4f3d7d2a /indra/newview/llpanelmediasettingsgeneral.h | |
| parent | b80c6d68874a11292e7dff59b03b1d0f46fad232 (diff) | |
| parent | 456bbdfa2f3471896f6981e70a9daa56dae51d18 (diff) | |
Merge from default branch
--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(); |