diff options
| author | Monroe Williams <monroe@lindenlab.com> | 2009-10-01 02:35:53 +0000 |
|---|---|---|
| committer | Monroe Williams <monroe@lindenlab.com> | 2009-10-01 02:35:53 +0000 |
| commit | cf9239cabcf7999a2d2393bd4bdb6fc08e27c09c (patch) | |
| tree | b366355f955b7bf55197ef6caa105881da88df32 /indra/newview/llfloaterpreference.cpp | |
| parent | 8135ddac021d3ea1aba2100f862bdb58eff33d07 (diff) | |
svn merge -r 134922:134973 svn+ssh://svn.lindenlab.com/svn/linden/branches/media-on-a-prim/moap-7
Merging branches/media-on-a-prim/moap-7 down to viewer-2.0.
Diffstat (limited to 'indra/newview/llfloaterpreference.cpp')
| -rw-r--r-- | indra/newview/llfloaterpreference.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index 761b5c9219..57c043a1e0 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -195,8 +195,8 @@ void fractionFromDecimal(F32 decimal_val, S32& numerator, S32& denominator); viewer_media_t get_web_media() { - viewer_media_t media_source = LLViewerMedia::newMediaImpl("", LLUUID::null, 0, 0, 0, 0, "text/html"); - + viewer_media_t media_source = LLViewerMedia::newMediaImpl(LLUUID::null); + media_source->initializeMedia("text/html"); return media_source; } |