diff options
| author | Rick Pasetto <rick@lindenlab.com> | 2010-02-04 11:24:54 -0800 |
|---|---|---|
| committer | Rick Pasetto <rick@lindenlab.com> | 2010-02-04 11:24:54 -0800 |
| commit | 9dd41cdceed43f1ffea14355c1b26c40db7b3591 (patch) | |
| tree | bbf63e268faeb08eaa640c2f413a3373c97f614b /indra/newview/llpanelmediasettingsgeneral.h | |
| parent | b25972fc2515ebf9699a54922d800c319846e9a1 (diff) | |
EXT-3144 EXT-4226: Re-employ tentative state for individual items in media settings
Review #95
This change undoes some prior change that seems to not allow showing
media data for multiple selection. There was all of this code put in
to support displaying tentative state for media, but code was added to
basically override it. Perhaps the reason was tentative state items
were not ignored on apply...this change does that.
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(); |