diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-03-16 10:19:37 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-03-16 10:19:37 -0400 |
| commit | ba414d500ca8cb88da530c89ba373c95195ce633 (patch) | |
| tree | 7101caf69a2d609d04f1352ad2f01c8d310e6228 /indra/media_plugins | |
| parent | 43f1abee2b7c8f2a1615ee98074b024156392dd9 (diff) | |
| parent | 9bdf262d8511e84c2425e48a466b60f185516c76 (diff) | |
automated merge viewer2.0->viewe2.0
Diffstat (limited to 'indra/media_plugins')
| -rw-r--r-- | indra/media_plugins/webkit/media_plugin_webkit.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/media_plugins/webkit/media_plugin_webkit.cpp b/indra/media_plugins/webkit/media_plugin_webkit.cpp index e66ac3049f..afde904be6 100644 --- a/indra/media_plugins/webkit/media_plugin_webkit.cpp +++ b/indra/media_plugins/webkit/media_plugin_webkit.cpp @@ -45,7 +45,7 @@ // set to 1 if you're using the version of llqtwebkit that's QPixmap-ified #if LL_LINUX -# define LL_QTWEBKIT_USES_PIXMAPS 1 +# define LL_QTWEBKIT_USES_PIXMAPS 0 #else # define LL_QTWEBKIT_USES_PIXMAPS 0 #endif // LL_LINUX |