summaryrefslogtreecommitdiff
path: root/indra/llplugin
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-02-09 14:52:13 +0000
committerTofu Linden <tofu.linden@lindenlab.com>2010-02-09 14:52:13 +0000
commitc66e9199a56f7fd43ddab423af9d37e71b51f158 (patch)
treeb19456ead3b12f23842ff48ea51a11ad625946ea /indra/llplugin
parent5abb6dece78d9c7639511830590e0f447790fa82 (diff)
Backed out changeset b1c241040751
Diffstat (limited to 'indra/llplugin')
-rw-r--r--indra/llplugin/llpluginclassmedia.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/indra/llplugin/llpluginclassmedia.cpp b/indra/llplugin/llpluginclassmedia.cpp
index b9bab491f3..6a2449cf4b 100644
--- a/indra/llplugin/llpluginclassmedia.cpp
+++ b/indra/llplugin/llpluginclassmedia.cpp
@@ -684,7 +684,6 @@ 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;
@@ -693,7 +692,7 @@ LLPluginClassMedia::ETargetType getTargetTypeFromLLQtWebkit(int target_type)
case LLQtWebKit::LTT_TARGET_EXTERNAL:
return LLPluginClassMedia::TARGET_EXTERNAL;
-#endif
+
default:
return LLPluginClassMedia::TARGET_OTHER;
}