diff options
author | Aleric Inglewood | 2010-10-15 18:01:07 +0200 |
---|---|---|
committer | Aleric Inglewood | 2010-10-15 18:01:07 +0200 |
commit | 8a62086cb0a9a8ae746bffa57e785cc4ca5be3a5 (patch) | |
tree | 4bcca7fd5648739fe6075235befd6da1dca11380 /linden/indra/llplugin | |
parent | Add missing semi-colon. (diff) | |
download | meta-impy-8a62086cb0a9a8ae746bffa57e785cc4ca5be3a5.zip meta-impy-8a62086cb0a9a8ae746bffa57e785cc4ca5be3a5.tar.gz meta-impy-8a62086cb0a9a8ae746bffa57e785cc4ca5be3a5.tar.bz2 meta-impy-8a62086cb0a9a8ae746bffa57e785cc4ca5be3a5.tar.xz |
Comment out code to make it compile at all (with the latest llqtwebkit).
Diffstat (limited to 'linden/indra/llplugin')
-rwxr-xr-x | linden/indra/llplugin/llpluginclassmedia.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/linden/indra/llplugin/llpluginclassmedia.cpp b/linden/indra/llplugin/llpluginclassmedia.cpp index 8664524..9f14920 100755 --- a/linden/indra/llplugin/llpluginclassmedia.cpp +++ b/linden/indra/llplugin/llpluginclassmedia.cpp | |||
@@ -724,6 +724,9 @@ void LLPluginClassMedia::setJavascriptEnabled(const bool enabled) | |||
724 | 724 | ||
725 | LLPluginClassMedia::ETargetType getTargetTypeFromLLQtWebkit(int target_type) | 725 | LLPluginClassMedia::ETargetType getTargetTypeFromLLQtWebkit(int target_type) |
726 | { | 726 | { |
727 | llassert(false); | ||
728 | return LLPluginClassMedia::TARGET_OTHER; | ||
729 | #if 0 | ||
727 | // convert a LinkTargetType value from llqtwebkit to an ETargetType | 730 | // convert a LinkTargetType value from llqtwebkit to an ETargetType |
728 | // so that we don't expose the llqtwebkit header in viewer code | 731 | // so that we don't expose the llqtwebkit header in viewer code |
729 | switch (target_type) | 732 | switch (target_type) |
@@ -740,6 +743,7 @@ LLPluginClassMedia::ETargetType getTargetTypeFromLLQtWebkit(int target_type) | |||
740 | default: | 743 | default: |
741 | return LLPluginClassMedia::TARGET_OTHER; | 744 | return LLPluginClassMedia::TARGET_OTHER; |
742 | } | 745 | } |
746 | #endif | ||
743 | } | 747 | } |
744 | 748 | ||
745 | /* virtual */ | 749 | /* virtual */ |