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/llselectmgr.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/llselectmgr.h')
| -rw-r--r-- | indra/newview/llselectmgr.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/newview/llselectmgr.h b/indra/newview/llselectmgr.h index f8ecfd0674..00474827ca 100644 --- a/indra/newview/llselectmgr.h +++ b/indra/newview/llselectmgr.h @@ -502,8 +502,7 @@ public: void selectionSetTexGen( U8 texgen ); void selectionSetShiny( U8 shiny ); void selectionSetFullbright( U8 fullbright ); - void selectionSetMedia( U8 media_type ); - void selectionSetMediaData(const LLSD &media_data); // NOTE: modifies media_data!!! + void selectionSetMedia( U8 media_type, const LLSD &media_data ); void selectionSetClickAction(U8 action); void selectionSetIncludeInSearch(bool include_in_search); void selectionSetGlow(const F32 glow); |