diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-02-04 19:04:03 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-02-04 19:04:03 -0500 |
| commit | a05766c200df4094c483a755b95b9a3ac970fe81 (patch) | |
| tree | ddec0c53547f743aa8649307716ab1d0df61f958 /indra/newview/llpanelmediasettingssecurity.h | |
| parent | 14d77a36d4392cd51a0887d957905ce4c532ba38 (diff) | |
| parent | 195b13beff0ea476ed47a08f6a44b85dc151eec8 (diff) | |
automated merge viewer2.0->viewer2.0
Diffstat (limited to 'indra/newview/llpanelmediasettingssecurity.h')
| -rw-r--r-- | indra/newview/llpanelmediasettingssecurity.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llpanelmediasettingssecurity.h b/indra/newview/llpanelmediasettingssecurity.h index 66ccb23f46..94f2fdc89c 100644 --- a/indra/newview/llpanelmediasettingssecurity.h +++ b/indra/newview/llpanelmediasettingssecurity.h @@ -53,11 +53,12 @@ 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(); - static void initValues( void* userdata, const LLSD& media_settings,bool editable ); + static void initValues( void* userdata, const LLSD& media_settings, bool editable); static void clearValues( void* userdata, bool editable); void addWhiteListEntry( const std::string& url ); void setParent( LLFloaterMediaSettings* parent ); |