diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-09 14:52:39 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-09 14:52:39 +0000 |
| commit | d181c3e41b7d8b52799e233db201e4da337c56fe (patch) | |
| tree | c9c10b19eb9a8253ebf5397a235dbc9fee98a59c /indra/llplugin/llpluginclassmedia.cpp | |
| parent | fa8f322ea41edf02d15089b9adebdae31524d893 (diff) | |
| parent | c66e9199a56f7fd43ddab423af9d37e71b51f158 (diff) | |
merge.
Diffstat (limited to 'indra/llplugin/llpluginclassmedia.cpp')
| -rw-r--r-- | indra/llplugin/llpluginclassmedia.cpp | 3 |
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; } |