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/llselectmgr.h | |
| parent | b8a46c81eefc3da66fc1a1c3ed9bfbf4418b535d (diff) | |
| parent | 41ab7853536dcbbf2b64d06b754617ee6bc7e896 (diff) | |
merge
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); |