diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-05 07:35:03 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-05 07:35:03 +0000 |
| commit | 197c78fa4bf372d09b315b1bad3cf6649627eb48 (patch) | |
| tree | d49217ad4a9b10fa907cfbefeba1453042b66f9a /indra/newview/llpanelmediasettingssecurity.h | |
| parent | 05e15ccb82541494bf7145652140de187d838cda (diff) | |
| parent | 367fda833cb5633564c2518f613a00484eb73ec5 (diff) | |
merge from viewer2 trunk.
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 ); |