diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2010-02-05 12:42:33 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2010-02-05 12:42:33 -0800 |
| commit | a8b6083f47e59bdff00cb5204fc42ef214f3567a (patch) | |
| tree | 642e1d53d4c77d0155315ba65daff746622e6dec /indra/newview/llpanelmediasettingssecurity.h | |
| parent | b8a46c81eefc3da66fc1a1c3ed9bfbf4418b535d (diff) | |
| parent | 41ab7853536dcbbf2b64d06b754617ee6bc7e896 (diff) | |
merge
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 ); |