Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer

Conflicts: indra/llmessage/llurlrequest.cpp indra/newview/llvoavatar.cpp
2012-11-12 06:46:58 +01:00
parent 59d4d833f1 d518222340
commit 303c74f4c9
200 changed files with 19362 additions and 3255 deletions
--- a/indra/plugins/webkit/CMakeLists.txt
+++ b/indra/plugins/webkit/CMakeLists.txt
@@ -7,6 +7,7 @@ include(LLCommon)
 include(LLImage)
 include(LLPlugin)
 include(LLMath)
+include(LLQtWebkit)
 include(LLRender)
 include(LLWindow)
 include(UI)
--- a/indra/plugins/webkit/media_plugin_webkit.cpp
+++ b/indra/plugins/webkit/media_plugin_webkit.cpp
@@ -26,7 +26,9 @@
 * @endcond
 */
 #include "linden_common.h"
+
 #include "llqtwebkit.h"
+
 #include "indra_constants.h" // for indra keyboard codes

 #include "lltimer.h"