diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-15 15:38:24 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-03-15 15:38:24 +0000 |
| commit | b6e11798acf6d0539211723e566be7f6145ac138 (patch) | |
| tree | 8be41ad18cac248336b3a55ea8ac0c8964197088 /indra/media_plugins | |
| parent | 0b8e1d87c5d6ca1c0b373477575348e57197736e (diff) | |
| parent | 42d1aaee2e3a9c5df3e7b4ace3bf6b5972a74847 (diff) | |
merge from viewer-2-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 |