diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-09 14:00:33 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-09 14:00:33 +0000 |
| commit | 5abb6dece78d9c7639511830590e0f447790fa82 (patch) | |
| tree | f258b8d0279100d43ac1127a5c38699a884b326f /indra/llplugin | |
| parent | bf2273d0adce6aae0a8c93f74d5cafe32e341674 (diff) | |
HACK HACK HACK to unbreak linux build while I wait for access to the new llqtwebkit code.
only affects linux. may harm webkit functionality temporarily. to be backed-out.
Diffstat (limited to 'indra/llplugin')
| -rw-r--r-- | indra/llplugin/llpluginclassmedia.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp index 6a2449cf4b..b9bab491f3 100644 --- a/indra/llplugin/llpluginclassmedia.cpp +++ b/indra/llplugin/llpluginclassmedia.cpp @@ -684,6 +684,7 @@ LLPluginClassMedia::ETargetType getTargetTypeFromLLQtWebkit(int target_type) // so that we don't expose the llqtwebkit header in viewer code switch (target_type) { +#if !LL_LINUX case LLQtWebKit::LTT_TARGET_NONE: return LLPluginClassMedia::TARGET_NONE; @@ -692,7 +693,7 @@ LLPluginClassMedia::ETargetType getTargetTypeFromLLQtWebkit(int target_type) case LLQtWebKit::LTT_TARGET_EXTERNAL: return LLPluginClassMedia::TARGET_EXTERNAL; - +#endif default: return LLPluginClassMedia::TARGET_OTHER; } |