diff options
| author | callum@lindenlab.com <callum@lindenlab.com> | 2017-02-13 12:29:37 -0800 |
|---|---|---|
| committer | callum@lindenlab.com <callum@lindenlab.com> | 2017-02-13 12:29:37 -0800 |
| commit | 238f9350b8fec05a170ce0cf93e50783b07a5abf (patch) | |
| tree | 719eccc4fd476c4a746c2ad3117c5b0f51190404 /indra/media_plugins/cef/media_plugin_cef.cpp | |
| parent | 13ec15beb948f0036ea281a5bee25355b5d5478b (diff) | |
| parent | ac9777bd8eed3899c48ba203d88911085c09e65a (diff) | |
Automated merge with head of callum_linden/viewer64-xcode8
Diffstat (limited to 'indra/media_plugins/cef/media_plugin_cef.cpp')
| -rw-r--r-- | indra/media_plugins/cef/media_plugin_cef.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp index d04bc16d4f..eaba71a6ad 100644 --- a/indra/media_plugins/cef/media_plugin_cef.cpp +++ b/indra/media_plugins/cef/media_plugin_cef.cpp @@ -39,7 +39,7 @@ #include "boost/function.hpp" #include "boost/bind.hpp" #include "llCEFLib.h" -#include "volume_catcher.h" +//#include "volume_catcher.h" //////////////////////////////////////////////////////////////////////////////// // @@ -99,8 +99,6 @@ private: std::string mPickedFile; LLCEFLib* mLLCEFLib; - VolumeCatcher mVolumeCatcher; - U8 *mPopupBuffer; U32 mPopupW; U32 mPopupH; @@ -432,7 +430,6 @@ void MediaPluginCEF::receiveMessage(const char* message_string) { mLLCEFLib->update(); - mVolumeCatcher.pump(); // this seems bad but unless the state changes (it won't until we figure out // how to get CEF to tell us if copy/cut/paste is available) then this function // will return immediately @@ -926,7 +923,6 @@ void MediaPluginCEF::checkEditState() void MediaPluginCEF::setVolume(F32 vol) { - mVolumeCatcher.setVolume(vol); } //////////////////////////////////////////////////////////////////////////////// |