diff options
| author | David Seikel | 2011-02-20 20:31:57 +1000 |
|---|---|---|
| committer | David Seikel | 2011-02-20 20:31:57 +1000 |
| commit | d6666d0776985bada40f19c623b86d82a4113f92 (patch) | |
| tree | eb4d234a313c51b40f6d53d4a59bdc831a7cd0fc /linden/indra/media_plugins/webkit/windows_volume_catcher.cpp | |
| parent | Remove catering to LL's probably illegal attempt to block copying of open sou... (diff) | |
| parent | Reduce the logging spam to warnings. Debug was too much. (diff) | |
| download | meta-impy-d6666d0776985bada40f19c623b86d82a4113f92.zip meta-impy-d6666d0776985bada40f19c623b86d82a4113f92.tar.gz meta-impy-d6666d0776985bada40f19c623b86d82a4113f92.tar.bz2 meta-impy-d6666d0776985bada40f19c623b86d82a4113f92.tar.xz | |
Merge branch 'weekly' into branding
Conflicts (solved):
linden/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
linden/indra/newview/llappviewer.cpp
linden/indra/newview/llappviewerwin32.cpp
Diffstat (limited to 'linden/indra/media_plugins/webkit/windows_volume_catcher.cpp')
| -rw-r--r-- | linden/indra/media_plugins/webkit/windows_volume_catcher.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linden/indra/media_plugins/webkit/windows_volume_catcher.cpp b/linden/indra/media_plugins/webkit/windows_volume_catcher.cpp index f1afea7..64f70c4 100644 --- a/linden/indra/media_plugins/webkit/windows_volume_catcher.cpp +++ b/linden/indra/media_plugins/webkit/windows_volume_catcher.cpp | |||
| @@ -34,6 +34,8 @@ | |||
| 34 | */ | 34 | */ |
| 35 | 35 | ||
| 36 | #include "volume_catcher.h" | 36 | #include "volume_catcher.h" |
| 37 | # define WIN32_LEAN_AND_MEAN | ||
| 38 | # include <winsock2.h> | ||
| 37 | #include <windows.h> | 39 | #include <windows.h> |
| 38 | #include "llmemory.h" | 40 | #include "llmemory.h" |
| 39 | class VolumeCatcherImpl : public LLSingleton<VolumeCatcherImpl> | 41 | class VolumeCatcherImpl : public LLSingleton<VolumeCatcherImpl> |